Code

Added Translation Strings.
authorjanw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 3 Apr 2008 14:08:05 +0000 (14:08 +0000)
committerjanw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 3 Apr 2008 14:08:05 +0000 (14:08 +0000)
Added German Translation.

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

gosa-plugins/glpi/locale/de/LC_MESSAGES/messages.po
gosa-plugins/glpi/locale/es/LC_MESSAGES/messages.po
gosa-plugins/glpi/locale/fr/LC_MESSAGES/messages.po
gosa-plugins/glpi/locale/it/LC_MESSAGES/messages.po
gosa-plugins/glpi/locale/messages.po
gosa-plugins/glpi/locale/nl/LC_MESSAGES/messages.po
gosa-plugins/glpi/locale/pl/LC_MESSAGES/messages.po
gosa-plugins/glpi/locale/ru/LC_MESSAGES/messages.po
gosa-plugins/glpi/locale/zh/LC_MESSAGES/messages.po

index 2f75daa253a2f0d8b1959813d834a4dd5b642e30..c5f754182b4ee92985524d017d6b898690a082a3 100644 (file)
 # translation of messages.po to Deutsch
-# Alfred Schroeder <schroeder@GONICUS.de>, 2004.
-# Cajus Pollmeier <pollmeier@gonicus.de>, 2004, 2005, 2006.
-# Jan Wenzel <jan.wenzel@gonicus.de>, 2004,2005.
-# Stefan Koehler <stefan.koehler@GONICUS.de>, 2005.
 # GOsa2 Translations
 # Copyright (C) 2003 GONICUS GmbH, Germany
 # This file is distributed under the same license as the GOsa2 package.
 #
 #
+# Alfred Schroeder <schroeder@GONICUS.de>, 2004.
+# Cajus Pollmeier <pollmeier@gonicus.de>, 2004, 2005, 2006.
+# Jan Wenzel <jan.wenzel@gonicus.de>, 2004,2005, 2008.
+# Stefan Koehler <stefan.koehler@GONICUS.de>, 2005.
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-14 13:40+0100\n"
-"PO-Revision-Date: 2007-06-18 15:08+0200\n"
-"Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
-"Language-Team: German <de@li.org>\n"
+"POT-Creation-Date: 2008-04-03 16:04+0200\n"
+"PO-Revision-Date: 2008-04-03 16:07+0200\n"
+"Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
+"Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:6
-msgid "List of users"
-msgstr "Liste der Benutzer"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
+msgid "Add/Edit manufacturer"
+msgstr "Hersteller hinzufügen/bearbeiten"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:20
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
-#: admin/systems/services/glpi/glpiPrinter.tpl:127
-msgid "Information"
-msgstr "Information"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
+#: admin/systems/services/glpi/glpi_devices.tpl:10
+#: admin/systems/services/glpi/glpi_devices.tpl:105
+#: admin/systems/services/glpi/glpi_devices.tpl:146
+#: admin/systems/services/glpi/glpi_devices.tpl:201
+#: admin/systems/services/glpi/glpi_devices.tpl:257
+#: admin/systems/services/glpi/glpi_devices.tpl:315
+#: admin/systems/services/glpi/glpi_devices.tpl:379
+#: admin/systems/services/glpi/glpi_devices.tpl:451
+#: admin/systems/services/glpi/glpi_devices.tpl:515
+#: admin/systems/services/glpi/glpi_devices.tpl:562
+#: admin/systems/services/glpi/glpi_devices.tpl:615
+#: admin/systems/services/glpi/glpi_devices.tpl:669
+#: admin/systems/services/glpi/glpi_devices.tpl:715
+msgid "Name"
+msgstr "Name"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:23
-msgid ""
-"This dialog allows you to select a user as technical responsible person."
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
+msgid "Website"
+msgstr "Website"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
+msgid "Address"
+msgstr "Adresse"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
+msgid "Phone number"
+msgstr "Telefonnummer"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
+msgid "Fax"
+msgstr "Fax"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr "Email"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
+#: admin/systems/services/glpi/glpi_devices.tpl:17
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
+msgid "Comments"
+msgstr "Kommentare"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
+#: admin/systems/services/glpi/glpi_edit_type.tpl:15
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
+#: admin/systems/services/glpi/glpi_edit_os.tpl:15
+#: admin/systems/services/glpi/glpiManufacturer.tpl:13
+msgid "Close"
+msgstr "Schliessen"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
+msgid "attachment"
+msgstr "Anhang"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
+#, php-format
+msgid "You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
-"Dieser Dialog erlaubt es Ihnen, einen Benutzer als technische Kontaktperson "
-"zu wählen."
+"Sie können diesen Anhang nicht entfernen, er wird noch von folgendem(n) "
+"System(en) verwendet: '%s'"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:27
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
-msgid "Filters"
-msgstr "Filter"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
+msgid "There is no valid file uploaded."
+msgstr "Es wurde keine gültige Datei hochgeladen."
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:35
-msgid "Display users matching"
-msgstr "Zeige die Benutzer, auf die Folgendes passt"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
+msgid "Upload wasn't successfull."
+msgstr "Upload war nicht erfolgreich."
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:37
-msgid "Regular expression for matching user names"
-msgstr "Regulärer Ausdruck zum Erkennen von Benutzernamen"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
+#, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
+msgstr ""
+"Das Verzeichnis '%s/glpi/' zum Speichern von GLPI-Uploads wurde nicht "
+"gefunden."
 
-#: admin/systems/services/glpi/glpi.tpl:6
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
+msgid "There is already a file with the same name uploaded."
+msgstr "Es wurde bereits eine Datei mit dem selben Namen hochgeladen."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
+#, php-format
+msgid "Can't create file '%s'."
+msgstr "Kann Datei '%s' nicht anlegen."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
+msgid "File is available."
+msgstr "Datei ist verfügbar."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
+msgid "File is not readable, possibly the file is missing."
+msgstr "Datei konnte nicht gelesen werden, vielleicht ist nicht vorhanden."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
+msgid "Currently no file uploaded."
+msgstr "Es wurde noch keine Datei hochgeladen."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
+msgid "Mime"
+msgstr "MIME"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
+msgid "Actions"
+msgstr "Aktionen"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
+msgid "This table displays all available attachments."
+msgstr "Diese Tabelle enthält alle verfügbaren Anhänge."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
+msgid "empty"
+msgstr "leer"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
+msgid "Create new attachment"
+msgstr "Neuen Anhang erstellen"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
+msgid "New Attachment"
+msgstr "Neuer Anhang"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
+msgid "This name is already in use."
+msgstr "Der angegebene Name wird bereits verwendet."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
+msgid "Please specify a valid name for this attachment."
+msgstr "Bitte geben Sie einen gültigen Namen für diesen Anhang an."
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:6
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:4
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:34
-#: admin/systems/services/glpi/glpiPrinter.tpl:6
+#: admin/systems/services/glpi/glpi.tpl:6
 msgid "Generic"
 msgstr "Allgemein"
 
-#: admin/systems/services/glpi/glpi.tpl:9
-msgid "System type"
-msgstr "System-Typ"
+#: admin/systems/services/glpi/glpiPrinter.tpl:9
+msgid "Printer type"
+msgstr "Druckertyp"
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:18
+#: admin/systems/services/glpi/glpiPrinter.tpl:32
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
 #: admin/systems/services/glpi/glpi.tpl:18
 #: admin/systems/services/glpi/glpi.tpl:32
 #: admin/systems/services/glpi/glpi.tpl:46
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
-#: admin/systems/services/glpi/glpiPrinter.tpl:18
-#: admin/systems/services/glpi/glpiPrinter.tpl:32
 msgid "edit"
 msgstr "Bearbeiten"
 
-#: admin/systems/services/glpi/glpi.tpl:23
-#: admin/systems/services/glpi/class_glpiAccount.inc:804
-msgid "Operating system"
-msgstr "Betriebssystem"
-
-#: admin/systems/services/glpi/glpi.tpl:37
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpiPrinter.tpl:23
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
 #: admin/systems/services/glpi/glpi_devices.tpl:24
 #: admin/systems/services/glpi/glpi_devices.tpl:123
 #: admin/systems/services/glpi/glpi_devices.tpl:164
@@ -95,44 +198,125 @@ msgstr "Betriebssystem"
 #: admin/systems/services/glpi/glpi_devices.tpl:633
 #: admin/systems/services/glpi/glpi_devices.tpl:687
 #: admin/systems/services/glpi/glpi_devices.tpl:733
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpi.tpl:37
 #: admin/systems/services/glpi/class_glpiAccount.inc:809
-#: admin/systems/services/glpi/glpiPrinter.tpl:23
 msgid "Manufacturer"
 msgstr "Hersteller"
 
-#: admin/systems/services/glpi/glpi.tpl:52
+#: admin/systems/services/glpi/glpiPrinter.tpl:39
+msgid "Supported interfaces"
+msgstr "Unterstützte Schnittstellen"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:48
+msgid "Serial"
+msgstr "Seriell"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:58
+msgid "Parallel"
+msgstr "Parallel"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:68
+msgid "USB"
+msgstr "USB"
+
 #: admin/systems/services/glpi/glpiPrinter.tpl:80
+#: admin/systems/services/glpi/glpi.tpl:52
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: admin/systems/services/glpi/glpi.tpl:56
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
-#: admin/systems/services/glpi/class_glpiAccount.inc:806
-#: admin/systems/services/glpi/glpiPrinter.tpl:94
-msgid "Contact person"
-msgstr "Kontaktperson"
+#: admin/systems/services/glpi/glpiPrinter.tpl:83
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
+#: admin/systems/services/glpi/glpi.tpl:66
+#: admin/systems/services/glpi/class_glpiAccount.inc:802
+msgid "Technical responsible"
+msgstr "Technischer Kontakt"
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:88
+#: admin/systems/services/glpi/glpiPrinter.tpl:99
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
 #: admin/systems/services/glpi/glpi.tpl:61
 #: admin/systems/services/glpi/glpi.tpl:71
 #: admin/systems/services/glpi/glpi.tpl:106
 #: admin/systems/services/glpi/glpiManufacturer.tpl:7
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
-#: admin/systems/services/glpi/glpiPrinter.tpl:88
-#: admin/systems/services/glpi/glpiPrinter.tpl:99
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: admin/systems/services/glpi/glpi.tpl:66
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
-#: admin/systems/services/glpi/class_glpiAccount.inc:802
-#: admin/systems/services/glpi/glpiPrinter.tpl:83
-msgid "Technical responsible"
-msgstr "Technischer Kontakt"
+#: admin/systems/services/glpi/glpiPrinter.tpl:94
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
+#: admin/systems/services/glpi/glpi.tpl:56
+#: admin/systems/services/glpi/class_glpiAccount.inc:806
+msgid "Contact person"
+msgstr "Kontaktperson"
 
-#: admin/systems/services/glpi/glpi.tpl:79
+#: admin/systems/services/glpi/glpiPrinter.tpl:107
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
+#: admin/systems/services/glpi/glpi.tpl:117
+#: admin/systems/services/glpi/class_glpiAccount.inc:810
+msgid "Attachments"
+msgstr "Anhänge"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:127
+#: admin/systems/services/glpi/glpiSelectUser.tpl:20
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
+msgid "Information"
+msgstr "Information"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:139
+msgid "Installed cartridges"
+msgstr "Installierte Patronen"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:152
+#: admin/systems/services/glpi/glpiManufacturer.tpl:8
+msgid "Remove"
+msgstr "Entfernen"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:1
+msgid "Manage System-types"
+msgstr "System-Typen verwalten"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:9
+#: admin/systems/services/glpi/glpi_edit_type.tpl:28
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
+#: admin/systems/services/glpi/glpi_edit_os.tpl:9
+#: admin/systems/services/glpi/glpi_edit_os.tpl:28
+msgid "Rename"
+msgstr "Umbenennen"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:24
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
+#: admin/systems/services/glpi/glpi_edit_os.tpl:24
+msgid "Please enter a new name"
+msgstr "Bitte geben Sie einen neuen Namen ein"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
+msgid "Can't delete this entry, it is still in use."
+msgstr "Kann diesen Eintrag nicht entfernen, da er noch benutzt wird."
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
+#: admin/systems/services/glpi/class_glpiAccount.inc:656
+#: admin/systems/services/glpi/class_glpiAccount.inc:671
+msgid "N/A"
+msgstr "N/A"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
+msgid "The selected name is already in use."
+msgstr "Der angegebene Name wird bereits verwendet."
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
+msgstr "Anhang"
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
 #: admin/systems/services/glpi/glpi_devices.tpl:112
 #: admin/systems/services/glpi/glpi_devices.tpl:153
 #: admin/systems/services/glpi/glpi_devices.tpl:208
@@ -145,212 +329,154 @@ msgstr "Technischer Kontakt"
 #: admin/systems/services/glpi/glpi_devices.tpl:622
 #: admin/systems/services/glpi/glpi_devices.tpl:676
 #: admin/systems/services/glpi/glpi_devices.tpl:722
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
+#: admin/systems/services/glpi/glpi.tpl:79
 #: admin/systems/services/glpi/class_glpiAccount.inc:803
 msgid "Comment"
 msgstr "Kommentar"
 
-#: admin/systems/services/glpi/glpi.tpl:96
-msgid "Installed devices"
-msgstr "Installierte Geräte"
-
-#: admin/systems/services/glpi/glpi.tpl:112
-msgid "Trading"
-msgstr "Handeln"
-
-#: admin/systems/services/glpi/glpi.tpl:113
-msgid "Software"
-msgstr "Software"
-
-#: admin/systems/services/glpi/glpi.tpl:114
-msgid "Contracts"
-msgstr "Verträge"
-
-#: admin/systems/services/glpi/glpi.tpl:117
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
-#: admin/systems/services/glpi/class_glpiAccount.inc:810
-#: admin/systems/services/glpi/glpiPrinter.tpl:107
-msgid "Attachments"
-msgstr "Anhänge"
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
-#: admin/systems/services/glpi/class_glpiAccount.inc:146
-msgid "There is no server with valid glpi database service."
-msgstr "Es wurde kein Server mit einer gültigen glpi-Datenbank gefunden."
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
-#: admin/systems/services/glpi/class_glpiAccount.inc:156
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
-msgstr ""
-"Die MySQL-Erweiterung wurde nicht gefunden - kann daher nicht zur glpi-"
-"Datenbank verbinden."
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
-#: admin/systems/services/glpi/class_glpiAccount.inc:166
-msgid "Can't connect to glpi database, check configuration twice."
-msgstr ""
-"Kann nicht zur glpi-Datenbank verbinden - bitte überprüfen Sie Ihre "
-"Konfiguration."
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
-#: admin/systems/services/glpi/class_glpiAccount.inc:181
-msgid "Download of attachment failed. Attachment was not found on server."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
-#: admin/systems/services/glpi/class_glpiAccount.inc:184
-msgid "Download of attachment failed. Not a valid attachment id."
-msgstr ""
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
+msgid "File"
+msgstr "Datei"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
-#: admin/systems/services/glpi/class_glpiAccount.inc:593
-msgid "Remove inventory"
-msgstr "Inventar entfernen"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
+msgid "Upload"
+msgstr "Hochladen"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Dieser Server besitzt aktivierte Inventar-Funktionen. Sie können diese durch "
-"einen Klick auf die Schaltfläche unten deaktivieren."
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
+msgid "Status"
+msgstr "Status"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
-#: admin/systems/services/glpi/class_glpiAccount.inc:596
-msgid "Add inventory"
-msgstr "Inventar hinzufügen"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
+msgid "Filename"
+msgstr "Dateiname"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
-msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Aktuell besitzt dieser Server keine aktivierten Inventar-Funktionen. Sie "
-"können diese durch einen Klick auf die Schaltfläche unten aktivieren."
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
+msgstr "MIME-Typ"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
-#, php-format
-msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
-msgstr ""
-"Kann Druckertyp nicht in '%s' umbenennen - der angegebene Name wird bereits "
-"verwendet."
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
+msgid "cartridge"
+msgstr "Patrone"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
 #, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
+msgid ""
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
 msgstr ""
-"Sie können diesen Druckertyp nicht entfernen, er wird noch von '%s' "
-"verwendet."
+"Sie können diesen Patronentyp nicht entfernen, er wird noch von folgendem(n) "
+"Drucker(n) verwendet: '%s'"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
-#: admin/systems/services/glpi/class_glpiAccount.inc:656
-#: admin/systems/services/glpi/class_glpiAccount.inc:671
-msgid "N/A"
-msgstr "N/A"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
+msgid "Cartridges"
+msgstr "Patronen"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
-msgid "since"
-msgstr "seit"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
+msgid "Action"
+msgstr "Aktion"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
-#: admin/systems/services/glpi/class_glpiAccount.inc:793
-msgid "Glpi"
-msgstr "GLPI"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
+msgid "Delete"
+msgstr "Entfernen"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
-msgid "Printer inventory extension"
-msgstr "Drucker-Inventar-Erweiterung"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
+msgid "New monitor"
+msgstr "Neuer Monitor"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
-msgid "Supports serial interface"
-msgstr "Unterstützt serielle Schnittstelle"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
+msgid "M"
+msgstr "M"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
-msgid "Supports parallel interface"
-msgstr "Unterstützt parallele Schnittstelle"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr ""
+"Sie können diesen Hersteller nicht entfernen, er wird noch von folgendem(n) "
+"System(en) verwendet: '%s'"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
-msgid "Supports usb interface"
-msgstr "Unterstützt USB-Schnittstelle"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
+msgid "Please specify a name."
+msgstr "Bitte geben Sie einen Namen ein!"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
-#: admin/systems/services/glpi/glpi_devices.tpl:17
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
-msgid "Comments"
-msgstr "Kommentare"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
+msgid "Specified name is already in use, please choose another one."
+msgstr "Der angegebene Name wird bereits verwendet. Bitte wählen Sie einen anderen."
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
-#: admin/systems/services/glpi/class_glpiAccount.inc:805
-msgid "Location"
-msgstr "Ort"
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
+msgstr "Referenz"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
 #: admin/systems/services/glpi/glpi_devices.tpl:427
 #: admin/systems/services/glpi/glpi_devices.tpl:492
 #: admin/systems/services/glpi/glpi_devices.tpl:542
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
 #: admin/systems/services/glpi/class_glpiAccount.inc:808
 msgid "Type"
 msgstr "Typ"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
-msgid "Cartridge settings"
-msgstr "Patronen-Einstellungen"
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
+msgid "Choose"
+msgstr "Wählen"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:2
-msgid "Warning"
-msgstr "Warnung"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:32
+#: admin/systems/services/glpi/class_goGlpiServer.inc:87
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
+msgid "Inventory database"
+msgstr "Inventar-Datenbank"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Bitte überprüfen Sie genau, was Sie tun. GOsa hat keine Möglichkeit, die "
-"Daten wiederherzustellen."
+#: admin/systems/services/glpi/class_goGlpiServer.inc:58
+msgid "Inventory database service"
+msgstr "Inventar-Datenbank Dienst"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Es ist eine gute Idee, vor dieser Aktion eine komplette Sicherung Ihrer "
-"MySQL-Datenbank zu erstellen. Wenn Sie dies erledigt haben, drücken Sie "
-"'Entfernen', um fortzufahren oder 'Abbrechen', um die aktuelle Aktion "
-"abzubrechen."
+#: admin/systems/services/glpi/class_goGlpiServer.inc:67
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "Das Attribut Benutzer ist leer oder enthält ungültige Zeichen."
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:70
+msgid "The attribute database is empty or contains invalid characters."
+msgstr "Das Attribut Datenbank ist leer oder enthält ungültige Zeichen."
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
+msgid "Services"
+msgstr "Dienste"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:96
+msgid "Start"
+msgstr "Start"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:97
+msgid "Stop"
+msgstr "Beenden"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:98
+msgid "Restart"
+msgstr "Neustart"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:100
+msgid "Admin"
+msgstr "Administrator"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:101
+#: admin/systems/services/glpi/goGlpiServer.tpl:20
+msgid "Database"
+msgstr "Datenbank"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:102
+#: admin/systems/services/glpi/goGlpiServer.tpl:12
+msgid "Password"
+msgstr "Passwort"
 
 #: admin/systems/services/glpi/glpi_devices.tpl:2
 msgid "Add/Edit monitor"
 msgstr "Monitor hinzufügen/bearbeiten"
 
-#: admin/systems/services/glpi/glpi_devices.tpl:10
-#: admin/systems/services/glpi/glpi_devices.tpl:105
-#: admin/systems/services/glpi/glpi_devices.tpl:146
-#: admin/systems/services/glpi/glpi_devices.tpl:201
-#: admin/systems/services/glpi/glpi_devices.tpl:257
-#: admin/systems/services/glpi/glpi_devices.tpl:315
-#: admin/systems/services/glpi/glpi_devices.tpl:379
-#: admin/systems/services/glpi/glpi_devices.tpl:451
-#: admin/systems/services/glpi/glpi_devices.tpl:515
-#: admin/systems/services/glpi/glpi_devices.tpl:562
-#: admin/systems/services/glpi/glpi_devices.tpl:615
-#: admin/systems/services/glpi/glpi_devices.tpl:669
-#: admin/systems/services/glpi/glpi_devices.tpl:715
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
-msgid "Name"
-msgstr "Name"
-
 #: admin/systems/services/glpi/glpi_devices.tpl:33
 msgid "Monitor size"
 msgstr "Monitorgröße"
@@ -501,84 +627,23 @@ msgstr "Frequenz"
 
 #: admin/systems/services/glpi/glpi_devices.tpl:649
 msgid "Default frequence"
-msgstr "Standardfrequenz"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:661
-msgid "Add/Edit motherboard"
-msgstr "Motherboard hinzufügen/bearbeiten"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:696
-msgid "Chipset"
-msgstr "Chipsatz"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:707
-msgid "Add/Edit computer case"
-msgstr "Computergehäuse hinzufügen/bearbeiten"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:742
-msgid "format"
-msgstr "Format"
-
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
-#: admin/systems/services/glpi/glpi_edit_os.tpl:9
-#: admin/systems/services/glpi/glpi_edit_os.tpl:28
-#: admin/systems/services/glpi/glpi_edit_type.tpl:9
-#: admin/systems/services/glpi/glpi_edit_type.tpl:28
-msgid "Rename"
-msgstr "Umbenennen"
-
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
-#: admin/systems/services/glpi/glpiManufacturer.tpl:13
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
-#: admin/systems/services/glpi/glpi_edit_os.tpl:15
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
-#: admin/systems/services/glpi/glpi_edit_type.tpl:15
-msgid "Close"
-msgstr "Schliessen"
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:1
-msgid "Manage manufacturers"
-msgstr "Hersteller verwalten"
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:8
-#: admin/systems/services/glpi/glpiPrinter.tpl:152
-msgid "Remove"
-msgstr "Entfernen"
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
-msgid "List of devices"
-msgstr "Liste der Geräte"
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
-msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
-msgstr ""
-"Dieser Dialog erlaubt es Ihnen, ein Gerät zum momentan ausgewählten Computer "
-"hinzuzufügen."
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
-msgid "Display devices matching"
-msgstr "Zeige die Geräte, auf die das Folgende passt"
+msgstr "Standardfrequenz"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
-msgid "Regular expression for matching device names"
-msgstr "Regulärer Ausdruck zum Erkennen von Gerätenamen"
+#: admin/systems/services/glpi/glpi_devices.tpl:661
+msgid "Add/Edit motherboard"
+msgstr "Motherboard hinzufügen/bearbeiten"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
-msgid "Use"
-msgstr "Benutzen"
+#: admin/systems/services/glpi/glpi_devices.tpl:696
+msgid "Chipset"
+msgstr "Chipsatz"
 
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
-#: admin/systems/services/glpi/glpi_edit_os.tpl:24
-#: admin/systems/services/glpi/glpi_edit_type.tpl:24
-msgid "Please enter a new name"
-msgstr "Bitte geben Sie einen neuen Namen ein"
+#: admin/systems/services/glpi/glpi_devices.tpl:707
+msgid "Add/Edit computer case"
+msgstr "Computergehäuse hinzufügen/bearbeiten"
+
+#: admin/systems/services/glpi/glpi_devices.tpl:742
+msgid "format"
+msgstr "Format"
 
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:88
 #, php-format
@@ -587,9 +652,8 @@ msgstr "Interner Fehler: Kann Gerät von Typ '%s' nicht anlegen."
 
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:108
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:110
-#, fuzzy
 msgid "glpi device"
-msgstr "Geräte"
+msgstr "GLPI-Gerät"
 
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:112
 msgid "Can't detect object name."
@@ -597,8 +661,7 @@ msgstr "Kann Objektnamen nicht erkennen."
 
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:133
 #, php-format
-msgid ""
-"You can't delete this device, it is still in use by these system(s) '%s'"
+msgid "You can't delete this device, it is still in use by these system(s) '%s'"
 msgstr ""
 "Sie können dieses Gerät nicht entfernen, es wird noch von folgendem(n) System"
 "(en) verwendet: '%s'"
@@ -607,26 +670,6 @@ msgstr ""
 msgid "devices"
 msgstr "Geräte"
 
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
-msgid "Actions"
-msgstr "Aktionen"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
-msgid "Delete"
-msgstr "Entfernen"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-msgid "New monitor"
-msgstr "Neuer Monitor"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-msgid "M"
-msgstr "M"
-
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:223
 msgid "New mainbord"
 msgstr "Neues Mainboard"
@@ -744,70 +787,58 @@ msgstr "keine"
 msgid "Other"
 msgstr "Andere"
 
-#: admin/systems/services/glpi/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
-msgstr "Betriebssysteme verwalten"
-
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
-msgid "Add/Edit manufacturer"
-msgstr "Hersteller hinzufügen/bearbeiten"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:6
+msgid "List of users"
+msgstr "Liste der Benutzer"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
-msgid "Website"
-msgstr "Website"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:23
+msgid "This dialog allows you to select a user as technical responsible person."
+msgstr ""
+"Dieser Dialog erlaubt es Ihnen, einen Benutzer als technische Kontaktperson "
+"zu wählen."
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
-msgid "Address"
-msgstr "Adresse"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:27
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
+msgid "Filters"
+msgstr "Filter"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
-msgid "Phone number"
-msgstr "Telefonnummer"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:35
+msgid "Display users matching"
+msgstr "Zeige die Benutzer, auf die Folgendes passt"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
-msgid "Fax"
-msgstr "Fax"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:37
+msgid "Regular expression for matching user names"
+msgstr "Regulärer Ausdruck zum Erkennen von Benutzernamen"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr "Email"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
+msgstr "Anhänge"
 
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
-#, php-format
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
-msgstr ""
-"Sie können diesen Hersteller nicht entfernen, er wird noch von folgendem(n) "
-"System(en) verwendet: '%s'"
-
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
-msgid "Please specify a name."
-msgstr "Bitte geben Sie einen Namen ein!"
-
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
-msgid "Specified name is already in use, please choose another one."
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
 msgstr ""
-"Der angegebene Name wird bereits verwendet. Bitte wählen Sie einen anderen."
-
-#: admin/systems/services/glpi/goGlpiServer.tpl:1
-msgid "GLPI database information"
-msgstr "Informationen der GLPI-Datenbank"
+"Dieser Dialog erlaubt es Ihnen, verschiedene Objekte (wie Anleitungen, "
+"Hilfen, etc.) zum momentan gewählten Computer hinzuzufügen."
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:4
-msgid "Logging DB user"
-msgstr "Protokoll-DB Benutzer"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
+msgid "Display attachments matching"
+msgstr "Zeige Anhänge, auf die zutrifft"
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:12
-#: admin/systems/services/glpi/class_goGlpiServer.inc:102
-msgid "Password"
-msgstr "Passwort"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
+msgid "Regular expression for matching attachment names"
+msgstr "Regulärer Ausdruck zum Erkennen von Anhangs-Namen"
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:20
-#: admin/systems/services/glpi/class_goGlpiServer.inc:101
-msgid "Database"
-msgstr "Datenbank"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
+msgid "Use"
+msgstr "Benutzen"
 
 #: admin/systems/services/glpi/glpiPrinterCartridges.tpl:6
 msgid "List of available cartridge type for this type of printer"
@@ -835,71 +866,175 @@ msgstr "Zeige die Patronentypen, auf die Folgendes passt"
 msgid "Regular expression for matching cartridge types"
 msgstr "Regulärer Ausdruck zum Erkennen von Patronentypen"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
-#, fuzzy
-msgid "cartridge"
-msgstr "Patronen"
+#: admin/systems/services/glpi/goGlpiServer.tpl:1
+msgid "GLPI database information"
+msgstr "Informationen der GLPI-Datenbank"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
+#: admin/systems/services/glpi/goGlpiServer.tpl:4
+msgid "Logging DB user"
+msgstr "Protokoll-DB Benutzer"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
+#: admin/systems/services/glpi/class_glpiAccount.inc:146
+msgid "There is no server with valid glpi database service."
+msgstr "Es wurde kein Server mit einer gültigen glpi-Datenbank gefunden."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
+#: admin/systems/services/glpi/class_glpiAccount.inc:156
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr ""
+"Die MySQL-Erweiterung wurde nicht gefunden - kann daher nicht zur glpi-"
+"Datenbank verbinden."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
+#: admin/systems/services/glpi/class_glpiAccount.inc:166
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr ""
+"Kann nicht zur glpi-Datenbank verbinden - bitte überprüfen Sie Ihre "
+"Konfiguration."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
+#: admin/systems/services/glpi/class_glpiAccount.inc:181
+msgid "Download of attachment failed. Attachment was not found on server."
+msgstr "Herunterladen des Anhangs fehlgeschlagen. Der Anhang wurde auf dem Server nicht gefunden."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
+#: admin/systems/services/glpi/class_glpiAccount.inc:184
+msgid "Download of attachment failed. Not a valid attachment id."
+msgstr "Herunterladen des Anhangs fehlgeschlagen. Keine gültige Anhangs-ID."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
+#: admin/systems/services/glpi/class_glpiAccount.inc:593
+msgid "Remove inventory"
+msgstr "Inventar entfernen"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Dieser Server besitzt aktivierte Inventar-Funktionen. Sie können diese durch "
+"einen Klick auf die Schaltfläche unten deaktivieren."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
+#: admin/systems/services/glpi/class_glpiAccount.inc:596
+msgid "Add inventory"
+msgstr "Inventar hinzufügen"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Aktuell besitzt dieser Server keine aktivierten Inventar-Funktionen. Sie "
+"können diese durch einen Klick auf die Schaltfläche unten aktivieren."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
 #, php-format
 msgid ""
-"You can't delete this cartridge type, it is still in use by this printer(s) "
-"'%s'."
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
 msgstr ""
-"Sie können diesen Patronentyp nicht entfernen, er wird noch von folgendem(n) "
-"Drucker(n) verwendet: '%s'"
+"Kann Druckertyp nicht in '%s' umbenennen - der angegebene Name wird bereits "
+"verwendet."
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
-msgid "Cartridges"
-msgstr "Patronen"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr ""
+"Sie können diesen Druckertyp nicht entfernen, er wird noch von '%s' "
+"verwendet."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
+msgid "since"
+msgstr "seit"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
+#: admin/systems/services/glpi/class_glpiAccount.inc:793
+msgid "Glpi"
+msgstr "GLPI"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
+msgid "Printer inventory extension"
+msgstr "Drucker-Inventar-Erweiterung"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
+msgid "Supports serial interface"
+msgstr "Unterstützt serielle Schnittstelle"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
+msgid "Supports parallel interface"
+msgstr "Unterstützt parallele Schnittstelle"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
+msgid "Supports usb interface"
+msgstr "Unterstützt USB-Schnittstelle"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
+#: admin/systems/services/glpi/class_glpiAccount.inc:805
+msgid "Location"
+msgstr "Ort"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
-msgid "Action"
-msgstr "Aktion"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
+msgid "Cartridge settings"
+msgstr "Patronen-Einstellungen"
 
-#: admin/systems/services/glpi/glpi_edit_type.tpl:1
-msgid "Manage System-types"
-msgstr "System-Typen verwalten"
+#: admin/systems/services/glpi/glpi.tpl:9
+msgid "System type"
+msgstr "System-Typ"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
-msgid "Can't delete this entry, it is still in use."
-msgstr "Kann diesen Eintrag nicht entfernen, da er noch benutzt wird."
+#: admin/systems/services/glpi/glpi.tpl:23
+#: admin/systems/services/glpi/class_glpiAccount.inc:804
+msgid "Operating system"
+msgstr "Betriebssystem"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
-msgid "The selected name is already in use."
-msgstr "Der angegebene Name wird bereits verwendet."
+#: admin/systems/services/glpi/glpi.tpl:96
+msgid "Installed devices"
+msgstr "Installierte Geräte"
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
-msgid "Reference"
-msgstr "Referenz"
+#: admin/systems/services/glpi/glpi.tpl:112
+msgid "Trading"
+msgstr "Handeln"
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
-msgid "Choose"
-msgstr "Wählen"
+#: admin/systems/services/glpi/glpi.tpl:113
+msgid "Software"
+msgstr "Software"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
-msgid "Attachment"
-msgstr "Anhang"
+#: admin/systems/services/glpi/glpi.tpl:114
+msgid "Contracts"
+msgstr "Verträge"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
-msgid "File"
-msgstr "Datei"
+#: admin/systems/services/glpi/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
+msgstr "Betriebssysteme verwalten"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
-msgid "Upload"
-msgstr "Hochladen"
+#: admin/systems/services/glpi/remove_glpi.tpl:2
+msgid "Warning"
+msgstr "Warnung"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
-msgid "Status"
-msgstr "Status"
+#: admin/systems/services/glpi/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Bitte überprüfen Sie genau, was Sie tun. GOsa hat keine Möglichkeit, die "
+"Daten wiederherzustellen."
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
-msgid "Filename"
-msgstr "Dateiname"
+#: admin/systems/services/glpi/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Es ist eine gute Idee, vor dieser Aktion eine komplette Sicherung Ihrer "
+"MySQL-Datenbank zu erstellen. Wenn Sie dies erledigt haben, drücken Sie "
+"'Entfernen', um fortzufahren oder 'Abbrechen', um die aktuelle Aktion "
+"abzubrechen."
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
-msgid "Mime-type"
-msgstr "MIME-Typ"
+#: admin/systems/services/glpi/glpiManufacturer.tpl:1
+msgid "Manage manufacturers"
+msgstr "Hersteller verwalten"
 
 #: admin/systems/services/glpi/class_glpiAccount.inc:198
 #: admin/systems/services/glpi/class_glpiAccount.inc:204
@@ -915,16 +1050,14 @@ msgstr ""
 
 #: admin/systems/services/glpi/class_glpiAccount.inc:332
 #, php-format
-msgid ""
-"You can't delete this system type, it is still in use by these system(s) '%s'"
+msgid "You can't delete this system type, it is still in use by these system(s) '%s'"
 msgstr ""
 "Sie können diesen Systemtyp nicht entfernen, er wird noch von folgendem(n) "
 "System(en) verwendet: '%s'"
 
 #: admin/systems/services/glpi/class_glpiAccount.inc:343
 msgid "Rename failed, this system type name is already used."
-msgstr ""
-"Das Umbenennen schlug fehl: Der angegebene Name wird bereits verwendet."
+msgstr "Das Umbenennen schlug fehl: Der angegebene Name wird bereits verwendet."
 
 #: admin/systems/services/glpi/class_glpiAccount.inc:399
 msgid "Adding new operating system failed, specifed name is already used."
@@ -991,50 +1124,6 @@ msgstr "Modell"
 msgid "Peripheral devices"
 msgstr "Externe Geräte"
 
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
-msgid "List of attachments"
-msgstr "Anhänge"
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
-msgstr ""
-"Dieser Dialog erlaubt es Ihnen, verschiedene Objekte (wie Anleitungen, "
-"Hilfen, etc.) zum momentan gewählten Computer hinzuzufügen."
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
-msgid "Display attachments matching"
-msgstr "Zeige Anhänge, auf die zutrifft"
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
-msgid "Regular expression for matching attachment names"
-msgstr "Regulärer Ausdruck zum Erkennen von Anhangs-Namen"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:9
-msgid "Printer type"
-msgstr "Druckertyp"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:39
-msgid "Supported interfaces"
-msgstr "Unterstützte Schnittstellen"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:48
-msgid "Serial"
-msgstr "Seriell"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:58
-msgid "Parallel"
-msgstr "Parallel"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:68
-msgid "USB"
-msgstr "USB"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:139
-msgid "Installed cartridges"
-msgstr "Installierte Patronen"
-
 #: admin/systems/services/glpi/class_glpiSelectUser.inc:108
 msgid "Users"
 msgstr "Benutzer"
@@ -1088,136 +1177,21 @@ msgstr "Basis"
 msgid "Submit department"
 msgstr "Aktualisieren"
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
-#, fuzzy
-msgid "attachment"
-msgstr "Anhang"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
-#, php-format
-msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
-msgstr ""
-"Sie können diesen Anhang nicht entfernen, er wird noch von folgendem(n) "
-"System(en) verwendet: '%s'"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
-msgid "There is no valid file uploaded."
-msgstr "Es wurde keine gültige Datei hochgeladen."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
-msgid "Upload wasn't successfull."
-msgstr "Upload war nicht erfolgreich."
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
+msgid "List of devices"
+msgstr "Liste der Geräte"
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
-#, php-format
-msgid "Missing directory '%s/glpi/' to store glpi uploads."
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
+msgid "This dialog allows you to attach a device to your currently edited computer."
 msgstr ""
-"Das Verzeichnis '%s/glpi/' zum Speichern von GLPI-Uploads wurde nicht "
-"gefunden."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
-msgid "There is already a file with the same name uploaded."
-msgstr "Es wurde bereits eine Datei mit dem selben Namen hochgeladen."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
-#, php-format
-msgid "Can't create file '%s'."
-msgstr "Kann Datei '%s' nicht anlegen."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
-msgid "File is available."
-msgstr "Datei ist verfügbar."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
-msgid "File is not readable, possibly the file is missing."
-msgstr "Datei konnte nicht gelesen werden, vielleicht ist nicht vorhanden."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
-msgid "Currently no file uploaded."
-msgstr "Es wurde noch keine Datei hochgeladen."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
-msgid "Mime"
-msgstr "MIME"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
-msgid "This table displays all available attachments."
-msgstr "Diese Tabelle enthält alle verfügbaren Anhänge."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
-msgid "empty"
-msgstr "leer"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
-msgid "Create new attachment"
-msgstr "Neuen Anhang erstellen"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
-msgid "New Attachment"
-msgstr "Neuer Anhang"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
-msgid "This name is already in use."
-msgstr "Der angegebene Name wird bereits verwendet."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
-msgid "Please specify a valid name for this attachment."
-msgstr "Bitte geben Sie einen gültigen Namen für diesen Anhang an."
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:32
-#: admin/systems/services/glpi/class_goGlpiServer.inc:87
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-msgid "Inventory database"
-msgstr "Inventar-Datenbank"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:58
-msgid "Inventory database service"
-msgstr "Inventar-Datenbank Dienst"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:67
-msgid "The attribute user is empty or contains invalid characters."
-msgstr "Das Attribut Benutzer ist leer oder enthält ungültige Zeichen."
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:70
-msgid "The attribute database is empty or contains invalid characters."
-msgstr "Das Attribut Datenbank ist leer oder enthält ungültige Zeichen."
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-msgid "Services"
-msgstr "Dienste"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:96
-msgid "Start"
-msgstr "Start"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:97
-msgid "Stop"
-msgstr "Beenden"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:98
-msgid "Restart"
-msgstr "Neustart"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:100
-msgid "Admin"
-msgstr "Administrator"
-
-#~ msgid "You're about to delete the glpi attachment component '%s'."
-#~ msgstr "Sind sind dabei, den GLPI Anhang '%s' zu löschen."
-
-#~ msgid "Add"
-#~ msgstr "Hinzufügen"
-
-#~ msgid "Cancel"
-#~ msgstr "Abbrechen"
+"Dieser Dialog erlaubt es Ihnen, ein Gerät zum momentan ausgewählten Computer "
+"hinzuzufügen."
 
-#~ msgid "Save"
-#~ msgstr "Speichern"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
+msgid "Display devices matching"
+msgstr "Zeige die Geräte, auf die das Folgende passt"
 
-#~ msgid "You're about to delete the glpi device '%s'."
-#~ msgstr "Sie sind dabei das GLPI Gerät '%s' zu löschen."
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
+msgid "Regular expression for matching device names"
+msgstr "Regulärer Ausdruck zum Erkennen von Gerätenamen"
 
-#~ msgid "You're about to delete the glpi cartridge type '%s'."
-#~ msgstr "Sind sind dabei, den GLPI Patronentyp '%s' zu löschen."
index 95a38abb05d96741d010ec41c27a5425063064d2..1392560294c0e7053446be9f113c40c58062c4b3 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-14 13:40+0100\n"
+"POT-Creation-Date: 2008-04-03 16:04+0200\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -17,66 +17,170 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:6
-msgid "List of users"
-msgstr "Lista de usuarios"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
+msgid "Add/Edit manufacturer"
+msgstr ""
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:20
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
-#: admin/systems/services/glpi/glpiPrinter.tpl:127
-msgid "Information"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
+#: admin/systems/services/glpi/glpi_devices.tpl:10
+#: admin/systems/services/glpi/glpi_devices.tpl:105
+#: admin/systems/services/glpi/glpi_devices.tpl:146
+#: admin/systems/services/glpi/glpi_devices.tpl:201
+#: admin/systems/services/glpi/glpi_devices.tpl:257
+#: admin/systems/services/glpi/glpi_devices.tpl:315
+#: admin/systems/services/glpi/glpi_devices.tpl:379
+#: admin/systems/services/glpi/glpi_devices.tpl:451
+#: admin/systems/services/glpi/glpi_devices.tpl:515
+#: admin/systems/services/glpi/glpi_devices.tpl:562
+#: admin/systems/services/glpi/glpi_devices.tpl:615
+#: admin/systems/services/glpi/glpi_devices.tpl:669
+#: admin/systems/services/glpi/glpi_devices.tpl:715
+msgid "Name"
+msgstr "Nombre"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
+msgid "Website"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:23
-msgid ""
-"This dialog allows you to select a user as technical responsible person."
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
+msgid "Address"
+msgstr "Dirección"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
+msgid "Phone number"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:27
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
-msgid "Filters"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
+msgid "Fax"
+msgstr "Fax"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
+msgid "Email"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:35
-msgid "Display users matching"
-msgstr "Mostrar usuarios que coincidan con"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
+#: admin/systems/services/glpi/glpi_devices.tpl:17
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
+msgid "Comments"
+msgstr "Comentarios"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:37
-msgid "Regular expression for matching user names"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
+#: admin/systems/services/glpi/glpi_edit_type.tpl:15
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
+#: admin/systems/services/glpi/glpi_edit_os.tpl:15
+#: admin/systems/services/glpi/glpiManufacturer.tpl:13
+msgid "Close"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:6
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
+#, fuzzy
+msgid "attachment"
+msgstr "Adjuntos"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
+#, php-format
+msgid ""
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
+msgstr ""
+"No puede eliminar este adjunto, está todavía en uso por el(los) sistema(s) '%"
+"s'"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
+msgid "There is no valid file uploaded."
+msgstr "No se ha subido ningún archivo valido."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
+msgid "Upload wasn't successfull."
+msgstr "El envío no fue correcto."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
+#, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
+msgstr "El directorio donde guardar los envíos '%s/glpi/'  no es accesible."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
+msgid "There is already a file with the same name uploaded."
+msgstr "Ya se ha subido anteriormente un fichero con este nombre."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
+#, php-format
+msgid "Can't create file '%s'."
+msgstr "No puedo crear el fichero '%s'."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
+msgid "File is available."
+msgstr "El archivo esta disponible."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
+msgid "File is not readable, possibly the file is missing."
+msgstr "No se puede acceder al archivo, posiblemente se haya perdido."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
+msgid "Currently no file uploaded."
+msgstr "No se ha subido ningún archivo actualmente."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
+msgid "Mime"
+msgstr "Mime"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
+msgid "Actions"
+msgstr "Acciones"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
+msgid "This table displays all available attachments."
+msgstr "Esta tabla muestra todos los adjuntos disponibles."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
+msgid "empty"
+msgstr "vacío"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
+msgid "Create new attachment"
+msgstr "Crear nuevo adjunto"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
+msgid "New Attachment"
+msgstr "Nuevo adjunto"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
+msgid "This name is already in use."
+msgstr "El nombre introducido ya esta siendo usado"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
+msgid "Please specify a valid name for this attachment."
+msgstr "Por favor introduzca un nombre de adjunto valido."
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:6
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:4
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:34
-#: admin/systems/services/glpi/glpiPrinter.tpl:6
+#: admin/systems/services/glpi/glpi.tpl:6
 msgid "Generic"
 msgstr "Genérico"
 
-#: admin/systems/services/glpi/glpi.tpl:9
-msgid "System type"
+#: admin/systems/services/glpi/glpiPrinter.tpl:9
+msgid "Printer type"
 msgstr ""
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:18
+#: admin/systems/services/glpi/glpiPrinter.tpl:32
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
 #: admin/systems/services/glpi/glpi.tpl:18
 #: admin/systems/services/glpi/glpi.tpl:32
 #: admin/systems/services/glpi/glpi.tpl:46
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
-#: admin/systems/services/glpi/glpiPrinter.tpl:18
-#: admin/systems/services/glpi/glpiPrinter.tpl:32
 msgid "edit"
 msgstr "editar"
 
-#: admin/systems/services/glpi/glpi.tpl:23
-#: admin/systems/services/glpi/class_glpiAccount.inc:804
-msgid "Operating system"
-msgstr "Sistema operativo"
-
-#: admin/systems/services/glpi/glpi.tpl:37
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpiPrinter.tpl:23
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
 #: admin/systems/services/glpi/glpi_devices.tpl:24
 #: admin/systems/services/glpi/glpi_devices.tpl:123
 #: admin/systems/services/glpi/glpi_devices.tpl:164
@@ -90,253 +194,287 @@ msgstr "Sistema operativo"
 #: admin/systems/services/glpi/glpi_devices.tpl:633
 #: admin/systems/services/glpi/glpi_devices.tpl:687
 #: admin/systems/services/glpi/glpi_devices.tpl:733
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpi.tpl:37
 #: admin/systems/services/glpi/class_glpiAccount.inc:809
-#: admin/systems/services/glpi/glpiPrinter.tpl:23
 msgid "Manufacturer"
 msgstr "Fabricante"
 
-#: admin/systems/services/glpi/glpi.tpl:52
+#: admin/systems/services/glpi/glpiPrinter.tpl:39
+msgid "Supported interfaces"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:48
+msgid "Serial"
+msgstr "Serie"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:58
+msgid "Parallel"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:68
+msgid "USB"
+msgstr ""
+
 #: admin/systems/services/glpi/glpiPrinter.tpl:80
+#: admin/systems/services/glpi/glpi.tpl:52
 msgid "Contacts"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:56
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
-#: admin/systems/services/glpi/class_glpiAccount.inc:806
-#: admin/systems/services/glpi/glpiPrinter.tpl:94
-msgid "Contact person"
-msgstr "Persona de contacto"
+#: admin/systems/services/glpi/glpiPrinter.tpl:83
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
+#: admin/systems/services/glpi/glpi.tpl:66
+#: admin/systems/services/glpi/class_glpiAccount.inc:802
+msgid "Technical responsible"
+msgstr "Responsable técnico"
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:88
+#: admin/systems/services/glpi/glpiPrinter.tpl:99
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
 #: admin/systems/services/glpi/glpi.tpl:61
 #: admin/systems/services/glpi/glpi.tpl:71
 #: admin/systems/services/glpi/glpi.tpl:106
 #: admin/systems/services/glpi/glpiManufacturer.tpl:7
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
-#: admin/systems/services/glpi/glpiPrinter.tpl:88
-#: admin/systems/services/glpi/glpiPrinter.tpl:99
 msgid "Edit"
 msgstr "Editar"
 
-#: admin/systems/services/glpi/glpi.tpl:66
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
-#: admin/systems/services/glpi/class_glpiAccount.inc:802
-#: admin/systems/services/glpi/glpiPrinter.tpl:83
-msgid "Technical responsible"
-msgstr "Responsable técnico"
-
-#: admin/systems/services/glpi/glpi.tpl:79
-#: admin/systems/services/glpi/glpi_devices.tpl:112
-#: admin/systems/services/glpi/glpi_devices.tpl:153
-#: admin/systems/services/glpi/glpi_devices.tpl:208
-#: admin/systems/services/glpi/glpi_devices.tpl:264
-#: admin/systems/services/glpi/glpi_devices.tpl:322
-#: admin/systems/services/glpi/glpi_devices.tpl:386
-#: admin/systems/services/glpi/glpi_devices.tpl:458
-#: admin/systems/services/glpi/glpi_devices.tpl:522
-#: admin/systems/services/glpi/glpi_devices.tpl:569
-#: admin/systems/services/glpi/glpi_devices.tpl:622
-#: admin/systems/services/glpi/glpi_devices.tpl:676
-#: admin/systems/services/glpi/glpi_devices.tpl:722
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
-#: admin/systems/services/glpi/class_glpiAccount.inc:803
-msgid "Comment"
-msgstr "Comentario"
+#: admin/systems/services/glpi/glpiPrinter.tpl:94
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
+#: admin/systems/services/glpi/glpi.tpl:56
+#: admin/systems/services/glpi/class_glpiAccount.inc:806
+msgid "Contact person"
+msgstr "Persona de contacto"
 
-#: admin/systems/services/glpi/glpi.tpl:96
-msgid "Installed devices"
-msgstr ""
+#: admin/systems/services/glpi/glpiPrinter.tpl:107
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
+#: admin/systems/services/glpi/glpi.tpl:117
+#: admin/systems/services/glpi/class_glpiAccount.inc:810
+msgid "Attachments"
+msgstr "Adjuntos"
 
-#: admin/systems/services/glpi/glpi.tpl:112
-msgid "Trading"
+#: admin/systems/services/glpi/glpiPrinter.tpl:127
+#: admin/systems/services/glpi/glpiSelectUser.tpl:20
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
+msgid "Information"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:113
-msgid "Software"
+#: admin/systems/services/glpi/glpiPrinter.tpl:139
+msgid "Installed cartridges"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:114
-msgid "Contracts"
-msgstr ""
+#: admin/systems/services/glpi/glpiPrinter.tpl:152
+#: admin/systems/services/glpi/glpiManufacturer.tpl:8
+msgid "Remove"
+msgstr "Eliminar"
 
-#: admin/systems/services/glpi/glpi.tpl:117
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
-#: admin/systems/services/glpi/class_glpiAccount.inc:810
-#: admin/systems/services/glpi/glpiPrinter.tpl:107
-msgid "Attachments"
-msgstr "Adjuntos"
+#: admin/systems/services/glpi/glpi_edit_type.tpl:1
+msgid "Manage System-types"
+msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
-#: admin/systems/services/glpi/class_glpiAccount.inc:146
-msgid "There is no server with valid glpi database service."
-msgstr "No existe un servidor con un servicio de base de datos glpi válido."
+#: admin/systems/services/glpi/glpi_edit_type.tpl:9
+#: admin/systems/services/glpi/glpi_edit_type.tpl:28
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
+#: admin/systems/services/glpi/glpi_edit_os.tpl:9
+#: admin/systems/services/glpi/glpi_edit_os.tpl:28
+msgid "Rename"
+msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
-#: admin/systems/services/glpi/class_glpiAccount.inc:156
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
+#: admin/systems/services/glpi/glpi_edit_type.tpl:24
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
+#: admin/systems/services/glpi/glpi_edit_os.tpl:24
+msgid "Please enter a new name"
 msgstr ""
-"No puedo conectar a la base de datos glpi, la extensión php-mysql no es "
-"accesible."
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
-#: admin/systems/services/glpi/class_glpiAccount.inc:166
-msgid "Can't connect to glpi database, check configuration twice."
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
+msgid "Can't delete this entry, it is still in use."
+msgstr "No se puede eliminar esta entrada, está todavía en uso."
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
+#: admin/systems/services/glpi/class_glpiAccount.inc:656
+#: admin/systems/services/glpi/class_glpiAccount.inc:671
+msgid "N/A"
+msgstr "N/A"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
+msgid "The selected name is already in use."
+msgstr "El nombre introducido ya esta siendo usado"
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
 msgstr ""
-"No puedo conectar a la base de datos glpi, compruebe la configuración de "
-"nuevo."
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
-#: admin/systems/services/glpi/class_glpiAccount.inc:181
-msgid "Download of attachment failed. Attachment was not found on server."
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
+#: admin/systems/services/glpi/glpi_devices.tpl:112
+#: admin/systems/services/glpi/glpi_devices.tpl:153
+#: admin/systems/services/glpi/glpi_devices.tpl:208
+#: admin/systems/services/glpi/glpi_devices.tpl:264
+#: admin/systems/services/glpi/glpi_devices.tpl:322
+#: admin/systems/services/glpi/glpi_devices.tpl:386
+#: admin/systems/services/glpi/glpi_devices.tpl:458
+#: admin/systems/services/glpi/glpi_devices.tpl:522
+#: admin/systems/services/glpi/glpi_devices.tpl:569
+#: admin/systems/services/glpi/glpi_devices.tpl:622
+#: admin/systems/services/glpi/glpi_devices.tpl:676
+#: admin/systems/services/glpi/glpi_devices.tpl:722
+#: admin/systems/services/glpi/glpi.tpl:79
+#: admin/systems/services/glpi/class_glpiAccount.inc:803
+msgid "Comment"
+msgstr "Comentario"
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
+msgid "File"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
-#: admin/systems/services/glpi/class_glpiAccount.inc:184
-msgid "Download of attachment failed. Not a valid attachment id."
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
+msgid "Upload"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
-#: admin/systems/services/glpi/class_glpiAccount.inc:593
-msgid "Remove inventory"
-msgstr "Eliminar inventario"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
+msgid "Status"
+msgstr "Estado"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
+msgid "Filename"
 msgstr ""
-"Este servidor tiene la extensión inventario activada. Puede desactivarla "
-"pulsando aquí."
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
-#: admin/systems/services/glpi/class_glpiAccount.inc:596
-msgid "Add inventory"
-msgstr "Añadir inventario"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
-msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
 msgstr ""
-"Este servidor tiene la extensión inventario desactivada. Puede activarla "
-"pulsando aquí."
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
+#, fuzzy
+msgid "cartridge"
+msgstr "Cartuchos"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
 #, php-format
 msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
 msgstr ""
-"No puedo cambiar el nombre del tipo de impresora a '%s' porque este tipo ya "
-"existe."
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
-msgstr "No puedo eliminar el tipo de impresora, todavía está en uso por '%s'."
+"Ha decidido eliminar el tipo de cartucho, aún está en uso por la impresora"
+"(s) '%s'."
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
-#: admin/systems/services/glpi/class_glpiAccount.inc:656
-#: admin/systems/services/glpi/class_glpiAccount.inc:671
-msgid "N/A"
-msgstr "N/A"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
+msgid "Cartridges"
+msgstr "Cartuchos"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
-msgid "since"
-msgstr "desde"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
+msgid "Action"
+msgstr "Acción"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
-#: admin/systems/services/glpi/class_glpiAccount.inc:793
-msgid "Glpi"
-msgstr "Glpi"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
+msgid "Delete"
+msgstr "Eliminar"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
-msgid "Printer inventory extension"
-msgstr "Extensión de inventario de impresión"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
+msgid "New monitor"
+msgstr "Nuevo monitor"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
-msgid "Supports serial interface"
-msgstr "Soporta interfaz serie"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
+msgid "M"
+msgstr "M"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
-msgid "Supports parallel interface"
-msgstr "Soporta interfaz paralelo"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr ""
+"No puede eliminar este fabricante, está todavía en uso por este(os) sistema"
+"(s) '%s'"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
-msgid "Supports usb interface"
-msgstr "Soporta interfaz usb"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
+msgid "Please specify a name."
+msgstr "Por favor introduzca un nombre"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
-#: admin/systems/services/glpi/glpi_devices.tpl:17
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
-msgid "Comments"
-msgstr "Comentarios"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
+msgid "Specified name is already in use, please choose another one."
+msgstr ""
+"El valor introducidocomo 'Nombre' esta siendo utilizado. Por favor elija "
+"otro."
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
-#: admin/systems/services/glpi/class_glpiAccount.inc:805
-msgid "Location"
-msgstr "Localización"
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
+msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
 #: admin/systems/services/glpi/glpi_devices.tpl:427
 #: admin/systems/services/glpi/glpi_devices.tpl:492
 #: admin/systems/services/glpi/glpi_devices.tpl:542
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
 #: admin/systems/services/glpi/class_glpiAccount.inc:808
 msgid "Type"
 msgstr "Tipo"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
-msgid "Cartridge settings"
-msgstr "Características del cartucho"
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
+msgid "Choose"
+msgstr ""
 
-#: admin/systems/services/glpi/remove_glpi.tpl:2
-msgid "Warning"
-msgstr "Aviso"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:32
+#: admin/systems/services/glpi/class_goGlpiServer.inc:87
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
+msgid "Inventory database"
+msgstr "Base de datos de inventario"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
+#: admin/systems/services/glpi/class_goGlpiServer.inc:58
+msgid "Inventory database service"
+msgstr "Servicio de base de datos de inventario"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
+#: admin/systems/services/glpi/class_goGlpiServer.inc:67
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "El atributo usuario está vacío o tiene caracteres no validos"
 
-#: admin/systems/services/glpi/glpi_devices.tpl:2
-msgid "Add/Edit monitor"
-msgstr ""
+#: admin/systems/services/glpi/class_goGlpiServer.inc:70
+msgid "The attribute database is empty or contains invalid characters."
+msgstr "¡El atributo base de datos está vacío o tiene caracteres no validos!"
 
-#: admin/systems/services/glpi/glpi_devices.tpl:10
-#: admin/systems/services/glpi/glpi_devices.tpl:105
-#: admin/systems/services/glpi/glpi_devices.tpl:146
-#: admin/systems/services/glpi/glpi_devices.tpl:201
-#: admin/systems/services/glpi/glpi_devices.tpl:257
-#: admin/systems/services/glpi/glpi_devices.tpl:315
-#: admin/systems/services/glpi/glpi_devices.tpl:379
-#: admin/systems/services/glpi/glpi_devices.tpl:451
-#: admin/systems/services/glpi/glpi_devices.tpl:515
-#: admin/systems/services/glpi/glpi_devices.tpl:562
-#: admin/systems/services/glpi/glpi_devices.tpl:615
-#: admin/systems/services/glpi/glpi_devices.tpl:669
-#: admin/systems/services/glpi/glpi_devices.tpl:715
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
-msgid "Name"
-msgstr "Nombre"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
+msgid "Services"
+msgstr "Servicios"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:96
+msgid "Start"
+msgstr "Inicio"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:97
+msgid "Stop"
+msgstr "Parada"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:98
+msgid "Restart"
+msgstr "Reiniciar"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:100
+msgid "Admin"
+msgstr "Administrador"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:101
+#: admin/systems/services/glpi/goGlpiServer.tpl:20
+msgid "Database"
+msgstr "Bases de datos"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:102
+#: admin/systems/services/glpi/goGlpiServer.tpl:12
+msgid "Password"
+msgstr "Contraseña"
+
+#: admin/systems/services/glpi/glpi_devices.tpl:2
+msgid "Add/Edit monitor"
+msgstr ""
 
 #: admin/systems/services/glpi/glpi_devices.tpl:33
 msgid "Monitor size"
@@ -506,65 +644,6 @@ msgstr ""
 msgid "format"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
-#: admin/systems/services/glpi/glpi_edit_os.tpl:9
-#: admin/systems/services/glpi/glpi_edit_os.tpl:28
-#: admin/systems/services/glpi/glpi_edit_type.tpl:9
-#: admin/systems/services/glpi/glpi_edit_type.tpl:28
-msgid "Rename"
-msgstr ""
-
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
-#: admin/systems/services/glpi/glpiManufacturer.tpl:13
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
-#: admin/systems/services/glpi/glpi_edit_os.tpl:15
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
-#: admin/systems/services/glpi/glpi_edit_type.tpl:15
-msgid "Close"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:1
-msgid "Manage manufacturers"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:8
-#: admin/systems/services/glpi/glpiPrinter.tpl:152
-msgid "Remove"
-msgstr "Eliminar"
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
-msgid "List of devices"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
-msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
-msgstr ""
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
-msgid "Display devices matching"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
-msgid "Regular expression for matching device names"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
-msgid "Use"
-msgstr "Usar"
-
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
-#: admin/systems/services/glpi/glpi_edit_os.tpl:24
-#: admin/systems/services/glpi/glpi_edit_type.tpl:24
-msgid "Please enter a new name"
-msgstr ""
-
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:88
 #, php-format
 msgid "Internal Error can't create device of type '%s'"
@@ -592,26 +671,6 @@ msgstr ""
 msgid "devices"
 msgstr "dispositivos"
 
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
-msgid "Actions"
-msgstr "Acciones"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
-msgid "Delete"
-msgstr "Eliminar"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-msgid "New monitor"
-msgstr "Nuevo monitor"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-msgid "M"
-msgstr "M"
-
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:223
 msgid "New mainbord"
 msgstr "Nueva placa base"
@@ -729,71 +788,55 @@ msgstr "Ninguno"
 msgid "Other"
 msgstr "Otro"
 
-#: admin/systems/services/glpi/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
-msgstr ""
+#: admin/systems/services/glpi/glpiSelectUser.tpl:6
+msgid "List of users"
+msgstr "Lista de usuarios"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
-msgid "Add/Edit manufacturer"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
 msgstr ""
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
-msgid "Website"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:27
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
+msgid "Filters"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
-msgid "Address"
-msgstr "Dirección"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:35
+msgid "Display users matching"
+msgstr "Mostrar usuarios que coincidan con"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
-msgid "Phone number"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:37
+msgid "Regular expression for matching user names"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
-msgid "Fax"
-msgstr "Fax"
-
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
-msgid "Email"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
-#, php-format
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
-msgstr ""
-"No puede eliminar este fabricante, está todavía en uso por este(os) sistema"
-"(s) '%s'"
-
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
-msgid "Please specify a name."
-msgstr "Por favor introduzca un nombre"
-
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
-msgid "Specified name is already in use, please choose another one."
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
 msgstr ""
-"El valor introducidocomo 'Nombre' esta siendo utilizado. Por favor elija "
-"otro."
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:1
-msgid "GLPI database information"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
+msgid "Display attachments matching"
 msgstr ""
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:4
-msgid "Logging DB user"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
+msgid "Regular expression for matching attachment names"
 msgstr ""
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:12
-#: admin/systems/services/glpi/class_goGlpiServer.inc:102
-msgid "Password"
-msgstr "Contraseña"
-
-#: admin/systems/services/glpi/goGlpiServer.tpl:20
-#: admin/systems/services/glpi/class_goGlpiServer.inc:101
-msgid "Database"
-msgstr "Bases de datos"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
+msgid "Use"
+msgstr "Usar"
 
 #: admin/systems/services/glpi/glpiPrinterCartridges.tpl:6
 msgid "List of available cartridge type for this type of printer"
@@ -812,74 +855,170 @@ msgstr ""
 msgid "Display cartridge types matching"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:37
-msgid "Regular expression for matching cartridge types"
-msgstr ""
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:37
+msgid "Regular expression for matching cartridge types"
+msgstr ""
+
+#: admin/systems/services/glpi/goGlpiServer.tpl:1
+msgid "GLPI database information"
+msgstr ""
+
+#: admin/systems/services/glpi/goGlpiServer.tpl:4
+msgid "Logging DB user"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
+#: admin/systems/services/glpi/class_glpiAccount.inc:146
+msgid "There is no server with valid glpi database service."
+msgstr "No existe un servidor con un servicio de base de datos glpi válido."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
+#: admin/systems/services/glpi/class_glpiAccount.inc:156
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr ""
+"No puedo conectar a la base de datos glpi, la extensión php-mysql no es "
+"accesible."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
+#: admin/systems/services/glpi/class_glpiAccount.inc:166
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr ""
+"No puedo conectar a la base de datos glpi, compruebe la configuración de "
+"nuevo."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
+#: admin/systems/services/glpi/class_glpiAccount.inc:181
+msgid "Download of attachment failed. Attachment was not found on server."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
+#: admin/systems/services/glpi/class_glpiAccount.inc:184
+msgid "Download of attachment failed. Not a valid attachment id."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
+#: admin/systems/services/glpi/class_glpiAccount.inc:593
+msgid "Remove inventory"
+msgstr "Eliminar inventario"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión inventario activada. Puede desactivarla "
+"pulsando aquí."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
+#: admin/systems/services/glpi/class_glpiAccount.inc:596
+msgid "Add inventory"
+msgstr "Añadir inventario"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión inventario desactivada. Puede activarla "
+"pulsando aquí."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
+#, php-format
+msgid ""
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
+msgstr ""
+"No puedo cambiar el nombre del tipo de impresora a '%s' porque este tipo ya "
+"existe."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr "No puedo eliminar el tipo de impresora, todavía está en uso por '%s'."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
+msgid "since"
+msgstr "desde"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
+#: admin/systems/services/glpi/class_glpiAccount.inc:793
+msgid "Glpi"
+msgstr "Glpi"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
+msgid "Printer inventory extension"
+msgstr "Extensión de inventario de impresión"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
+msgid "Supports serial interface"
+msgstr "Soporta interfaz serie"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
-#, fuzzy
-msgid "cartridge"
-msgstr "Cartuchos"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
+msgid "Supports parallel interface"
+msgstr "Soporta interfaz paralelo"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
-#, php-format
-msgid ""
-"You can't delete this cartridge type, it is still in use by this printer(s) "
-"'%s'."
-msgstr ""
-"Ha decidido eliminar el tipo de cartucho, aún está en uso por la impresora"
-"(s) '%s'."
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
+msgid "Supports usb interface"
+msgstr "Soporta interfaz usb"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
-msgid "Cartridges"
-msgstr "Cartuchos"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
+#: admin/systems/services/glpi/class_glpiAccount.inc:805
+msgid "Location"
+msgstr "Localización"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
-msgid "Action"
-msgstr "Acción"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
+msgid "Cartridge settings"
+msgstr "Características del cartucho"
 
-#: admin/systems/services/glpi/glpi_edit_type.tpl:1
-msgid "Manage System-types"
+#: admin/systems/services/glpi/glpi.tpl:9
+msgid "System type"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
-msgid "Can't delete this entry, it is still in use."
-msgstr "No se puede eliminar esta entrada, está todavía en uso."
-
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
-msgid "The selected name is already in use."
-msgstr "El nombre introducido ya esta siendo usado"
+#: admin/systems/services/glpi/glpi.tpl:23
+#: admin/systems/services/glpi/class_glpiAccount.inc:804
+msgid "Operating system"
+msgstr "Sistema operativo"
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
-msgid "Reference"
+#: admin/systems/services/glpi/glpi.tpl:96
+msgid "Installed devices"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
-msgid "Choose"
+#: admin/systems/services/glpi/glpi.tpl:112
+msgid "Trading"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
-msgid "Attachment"
+#: admin/systems/services/glpi/glpi.tpl:113
+msgid "Software"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
-msgid "File"
+#: admin/systems/services/glpi/glpi.tpl:114
+msgid "Contracts"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
-msgid "Upload"
+#: admin/systems/services/glpi/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
-msgid "Status"
-msgstr "Estado"
+#: admin/systems/services/glpi/remove_glpi.tpl:2
+msgid "Warning"
+msgstr "Aviso"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
-msgid "Filename"
+#: admin/systems/services/glpi/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
-msgid "Mime-type"
+#: admin/systems/services/glpi/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+
+#: admin/systems/services/glpi/glpiManufacturer.tpl:1
+msgid "Manage manufacturers"
 msgstr ""
 
 #: admin/systems/services/glpi/class_glpiAccount.inc:198
@@ -972,48 +1111,6 @@ msgstr "Modelo"
 msgid "Peripheral devices"
 msgstr "Dispositivo periférico"
 
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
-msgid "List of attachments"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
-msgstr ""
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
-msgid "Display attachments matching"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
-msgid "Regular expression for matching attachment names"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:9
-msgid "Printer type"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:39
-msgid "Supported interfaces"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:48
-msgid "Serial"
-msgstr "Serie"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:58
-msgid "Parallel"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:68
-msgid "USB"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:139
-msgid "Installed cartridges"
-msgstr ""
-
 #: admin/systems/services/glpi/class_glpiSelectUser.inc:108
 msgid "Users"
 msgstr "Usuarios"
@@ -1067,119 +1164,22 @@ msgstr "Base"
 msgid "Submit department"
 msgstr "Enviar departamento"
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
-#, fuzzy
-msgid "attachment"
-msgstr "Adjuntos"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
+msgid "List of devices"
+msgstr ""
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
-#, php-format
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
 msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
+"This dialog allows you to attach a device to your currently edited computer."
 msgstr ""
-"No puede eliminar este adjunto, está todavía en uso por el(los) sistema(s) '%"
-"s'"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
-msgid "There is no valid file uploaded."
-msgstr "No se ha subido ningún archivo valido."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
-msgid "Upload wasn't successfull."
-msgstr "El envío no fue correcto."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
-#, php-format
-msgid "Missing directory '%s/glpi/' to store glpi uploads."
-msgstr "El directorio donde guardar los envíos '%s/glpi/'  no es accesible."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
-msgid "There is already a file with the same name uploaded."
-msgstr "Ya se ha subido anteriormente un fichero con este nombre."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
-#, php-format
-msgid "Can't create file '%s'."
-msgstr "No puedo crear el fichero '%s'."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
-msgid "File is available."
-msgstr "El archivo esta disponible."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
-msgid "File is not readable, possibly the file is missing."
-msgstr "No se puede acceder al archivo, posiblemente se haya perdido."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
-msgid "Currently no file uploaded."
-msgstr "No se ha subido ningún archivo actualmente."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
-msgid "Mime"
-msgstr "Mime"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
-msgid "This table displays all available attachments."
-msgstr "Esta tabla muestra todos los adjuntos disponibles."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
-msgid "empty"
-msgstr "vacío"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
-msgid "Create new attachment"
-msgstr "Crear nuevo adjunto"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
-msgid "New Attachment"
-msgstr "Nuevo adjunto"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
-msgid "This name is already in use."
-msgstr "El nombre introducido ya esta siendo usado"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
-msgid "Please specify a valid name for this attachment."
-msgstr "Por favor introduzca un nombre de adjunto valido."
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:32
-#: admin/systems/services/glpi/class_goGlpiServer.inc:87
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-msgid "Inventory database"
-msgstr "Base de datos de inventario"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:58
-msgid "Inventory database service"
-msgstr "Servicio de base de datos de inventario"
 
-#: admin/systems/services/glpi/class_goGlpiServer.inc:67
-msgid "The attribute user is empty or contains invalid characters."
-msgstr "El atributo usuario está vacío o tiene caracteres no validos"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:70
-msgid "The attribute database is empty or contains invalid characters."
-msgstr "¡El atributo base de datos está vacío o tiene caracteres no validos!"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-msgid "Services"
-msgstr "Servicios"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:96
-msgid "Start"
-msgstr "Inicio"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:97
-msgid "Stop"
-msgstr "Parada"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:98
-msgid "Restart"
-msgstr "Reiniciar"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
+msgid "Display devices matching"
+msgstr ""
 
-#: admin/systems/services/glpi/class_goGlpiServer.inc:100
-msgid "Admin"
-msgstr "Administrador"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
+msgid "Regular expression for matching device names"
+msgstr ""
 
 #~ msgid "You're about to delete the glpi attachment component '%s'."
 #~ msgstr "Ha decidido eliminar el componente adjunto glpi '%s'."
index 405494003a7ca59f5fe7913ea0d7b1c8244cb0f1..393ce8d27bcc7feda107b71dc65038221069be68 100644 (file)
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-14 13:40+0100\n"
+"POT-Creation-Date: 2008-04-03 16:04+0200\n"
 "PO-Revision-Date: 2007-07-19 11:57+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -14,68 +14,170 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:6
-msgid "List of users"
-msgstr "Liste des utilisateurs"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
+msgid "Add/Edit manufacturer"
+msgstr "Ajouter/Modifier un fabricant"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:20
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
-#: admin/systems/services/glpi/glpiPrinter.tpl:127
-msgid "Information"
-msgstr "Information"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
+#: admin/systems/services/glpi/glpi_devices.tpl:10
+#: admin/systems/services/glpi/glpi_devices.tpl:105
+#: admin/systems/services/glpi/glpi_devices.tpl:146
+#: admin/systems/services/glpi/glpi_devices.tpl:201
+#: admin/systems/services/glpi/glpi_devices.tpl:257
+#: admin/systems/services/glpi/glpi_devices.tpl:315
+#: admin/systems/services/glpi/glpi_devices.tpl:379
+#: admin/systems/services/glpi/glpi_devices.tpl:451
+#: admin/systems/services/glpi/glpi_devices.tpl:515
+#: admin/systems/services/glpi/glpi_devices.tpl:562
+#: admin/systems/services/glpi/glpi_devices.tpl:615
+#: admin/systems/services/glpi/glpi_devices.tpl:669
+#: admin/systems/services/glpi/glpi_devices.tpl:715
+msgid "Name"
+msgstr "Nom"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:23
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
+msgid "Website"
+msgstr "Site web"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
+msgid "Address"
+msgstr "Adresse"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
+msgid "Phone number"
+msgstr "Numéro de téléphone"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
+msgid "Fax"
+msgstr "Fax"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr "Adresse de messagerie"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
+#: admin/systems/services/glpi/glpi_devices.tpl:17
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
+msgid "Comments"
+msgstr "Commentaires"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
+#: admin/systems/services/glpi/glpi_edit_type.tpl:15
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
+#: admin/systems/services/glpi/glpi_edit_os.tpl:15
+#: admin/systems/services/glpi/glpiManufacturer.tpl:13
+msgid "Close"
+msgstr "Fermer"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
+#, fuzzy
+msgid "attachment"
+msgstr "Document lié"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
+#, php-format
 msgid ""
-"This dialog allows you to select a user as technical responsible person."
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
-"Ce dialogue vous permet de désigner un utilisateur comme personne "
-"responsable."
+"Impossible d'effacer ce fichier attaché, tant qu'il est utilisé par ce(s) "
+"système(s) '%s'."
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:27
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
-msgid "Filters"
-msgstr "Filtres"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
+msgid "There is no valid file uploaded."
+msgstr "Pas de fichier valide téléchargé."
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:35
-msgid "Display users matching"
-msgstr "Afficher les utilisateurs correspondants"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
+msgid "Upload wasn't successfull."
+msgstr "Le téléchargement n'a pas réussi."
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:37
-msgid "Regular expression for matching user names"
-msgstr "Expression régulière concordant avec les noms des utilisateurs"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
+#, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
+msgstr "Le répertoire de téléchargement pour gpli '%s/glpi' est manquant."
 
-#: admin/systems/services/glpi/glpi.tpl:6
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
+msgid "There is already a file with the same name uploaded."
+msgstr "Il existe déjà un fichier avec ce nom."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
+#, php-format
+msgid "Can't create file '%s'."
+msgstr "Impossible de créer le fichier '%s'."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
+msgid "File is available."
+msgstr "Le fichier est disponible."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
+msgid "File is not readable, possibly the file is missing."
+msgstr "Le fichier n'est pas lisible, il est probablement manquant."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
+msgid "Currently no file uploaded."
+msgstr "Pas de fichier téléchargé."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
+msgid "Mime"
+msgstr "Mime"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
+msgid "Actions"
+msgstr "Actions"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
+msgid "This table displays all available attachments."
+msgstr "Ce tableau montre tout les fichiers attachés disponibles."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
+msgid "empty"
+msgstr "vide"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
+msgid "Create new attachment"
+msgstr "Créer un nouveau fichier attaché"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
+msgid "New Attachment"
+msgstr "Nouveau document lié"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
+msgid "This name is already in use."
+msgstr "Le nom spécifié est déjà utilisé."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
+msgid "Please specify a valid name for this attachment."
+msgstr "Veuillez spécifier un nom valide pour ce document lié."
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:6
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:4
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:34
-#: admin/systems/services/glpi/glpiPrinter.tpl:6
+#: admin/systems/services/glpi/glpi.tpl:6
 msgid "Generic"
 msgstr "Informations"
 
-#: admin/systems/services/glpi/glpi.tpl:9
-msgid "System type"
-msgstr "Type de système"
+#: admin/systems/services/glpi/glpiPrinter.tpl:9
+msgid "Printer type"
+msgstr "Type de l'imprimante"
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:18
+#: admin/systems/services/glpi/glpiPrinter.tpl:32
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
 #: admin/systems/services/glpi/glpi.tpl:18
 #: admin/systems/services/glpi/glpi.tpl:32
 #: admin/systems/services/glpi/glpi.tpl:46
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
-#: admin/systems/services/glpi/glpiPrinter.tpl:18
-#: admin/systems/services/glpi/glpiPrinter.tpl:32
 msgid "edit"
 msgstr "éditer"
 
-#: admin/systems/services/glpi/glpi.tpl:23
-#: admin/systems/services/glpi/class_glpiAccount.inc:804
-msgid "Operating system"
-msgstr "Système d'exploitation"
-
-#: admin/systems/services/glpi/glpi.tpl:37
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpiPrinter.tpl:23
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
 #: admin/systems/services/glpi/glpi_devices.tpl:24
 #: admin/systems/services/glpi/glpi_devices.tpl:123
 #: admin/systems/services/glpi/glpi_devices.tpl:164
@@ -89,44 +191,125 @@ msgstr "Système d'exploitation"
 #: admin/systems/services/glpi/glpi_devices.tpl:633
 #: admin/systems/services/glpi/glpi_devices.tpl:687
 #: admin/systems/services/glpi/glpi_devices.tpl:733
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpi.tpl:37
 #: admin/systems/services/glpi/class_glpiAccount.inc:809
-#: admin/systems/services/glpi/glpiPrinter.tpl:23
 msgid "Manufacturer"
 msgstr "Fabricant"
 
-#: admin/systems/services/glpi/glpi.tpl:52
+#: admin/systems/services/glpi/glpiPrinter.tpl:39
+msgid "Supported interfaces"
+msgstr "Interfaces supportées"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:48
+msgid "Serial"
+msgstr "Série"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:58
+msgid "Parallel"
+msgstr "Parallèle"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:68
+msgid "USB"
+msgstr "USB"
+
 #: admin/systems/services/glpi/glpiPrinter.tpl:80
+#: admin/systems/services/glpi/glpi.tpl:52
 msgid "Contacts"
 msgstr "Contacts"
 
-#: admin/systems/services/glpi/glpi.tpl:56
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
-#: admin/systems/services/glpi/class_glpiAccount.inc:806
-#: admin/systems/services/glpi/glpiPrinter.tpl:94
-msgid "Contact person"
-msgstr "Personne de contact"
+#: admin/systems/services/glpi/glpiPrinter.tpl:83
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
+#: admin/systems/services/glpi/glpi.tpl:66
+#: admin/systems/services/glpi/class_glpiAccount.inc:802
+msgid "Technical responsible"
+msgstr "Responsable technique"
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:88
+#: admin/systems/services/glpi/glpiPrinter.tpl:99
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
 #: admin/systems/services/glpi/glpi.tpl:61
 #: admin/systems/services/glpi/glpi.tpl:71
 #: admin/systems/services/glpi/glpi.tpl:106
 #: admin/systems/services/glpi/glpiManufacturer.tpl:7
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
-#: admin/systems/services/glpi/glpiPrinter.tpl:88
-#: admin/systems/services/glpi/glpiPrinter.tpl:99
 msgid "Edit"
 msgstr "Editer"
 
-#: admin/systems/services/glpi/glpi.tpl:66
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
-#: admin/systems/services/glpi/class_glpiAccount.inc:802
-#: admin/systems/services/glpi/glpiPrinter.tpl:83
-msgid "Technical responsible"
-msgstr "Responsable technique"
+#: admin/systems/services/glpi/glpiPrinter.tpl:94
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
+#: admin/systems/services/glpi/glpi.tpl:56
+#: admin/systems/services/glpi/class_glpiAccount.inc:806
+msgid "Contact person"
+msgstr "Personne de contact"
 
-#: admin/systems/services/glpi/glpi.tpl:79
+#: admin/systems/services/glpi/glpiPrinter.tpl:107
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
+#: admin/systems/services/glpi/glpi.tpl:117
+#: admin/systems/services/glpi/class_glpiAccount.inc:810
+msgid "Attachments"
+msgstr "Documents liés"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:127
+#: admin/systems/services/glpi/glpiSelectUser.tpl:20
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
+msgid "Information"
+msgstr "Information"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:139
+msgid "Installed cartridges"
+msgstr "Cartouches installés"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:152
+#: admin/systems/services/glpi/glpiManufacturer.tpl:8
+msgid "Remove"
+msgstr "Supprimer"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:1
+msgid "Manage System-types"
+msgstr "Gérer le type de système"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:9
+#: admin/systems/services/glpi/glpi_edit_type.tpl:28
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
+#: admin/systems/services/glpi/glpi_edit_os.tpl:9
+#: admin/systems/services/glpi/glpi_edit_os.tpl:28
+msgid "Rename"
+msgstr "Renommer"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:24
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
+#: admin/systems/services/glpi/glpi_edit_os.tpl:24
+msgid "Please enter a new name"
+msgstr "Veuillez entrer un nouveau nom"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
+msgid "Can't delete this entry, it is still in use."
+msgstr "Impossible d'effacer cette entrée elle est encore utilisée"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
+#: admin/systems/services/glpi/class_glpiAccount.inc:656
+#: admin/systems/services/glpi/class_glpiAccount.inc:671
+msgid "N/A"
+msgstr "N/A"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
+msgid "The selected name is already in use."
+msgstr "Le nom spécifié est déjà utilisé."
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
+msgstr "Document lié"
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
 #: admin/systems/services/glpi/glpi_devices.tpl:112
 #: admin/systems/services/glpi/glpi_devices.tpl:153
 #: admin/systems/services/glpi/glpi_devices.tpl:208
@@ -139,210 +322,156 @@ msgstr "Responsable technique"
 #: admin/systems/services/glpi/glpi_devices.tpl:622
 #: admin/systems/services/glpi/glpi_devices.tpl:676
 #: admin/systems/services/glpi/glpi_devices.tpl:722
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
+#: admin/systems/services/glpi/glpi.tpl:79
 #: admin/systems/services/glpi/class_glpiAccount.inc:803
 msgid "Comment"
 msgstr "Commentaires"
 
-#: admin/systems/services/glpi/glpi.tpl:96
-msgid "Installed devices"
-msgstr "Périphériques installés"
-
-#: admin/systems/services/glpi/glpi.tpl:112
-msgid "Trading"
-msgstr ""
-
-#: admin/systems/services/glpi/glpi.tpl:113
-msgid "Software"
-msgstr "Logiciel"
-
-#: admin/systems/services/glpi/glpi.tpl:114
-msgid "Contracts"
-msgstr "Contrats"
-
-#: admin/systems/services/glpi/glpi.tpl:117
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
-#: admin/systems/services/glpi/class_glpiAccount.inc:810
-#: admin/systems/services/glpi/glpiPrinter.tpl:107
-msgid "Attachments"
-msgstr "Documents liés"
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
-#: admin/systems/services/glpi/class_glpiAccount.inc:146
-msgid "There is no server with valid glpi database service."
-msgstr "Il n'y a pas de serveur qui contient un service glpi valide."
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
-#: admin/systems/services/glpi/class_glpiAccount.inc:156
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
-msgstr ""
-"Impossible de se connecter sur la base de données glpi, l'extension php-"
-"mysql n'est pas disponible."
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
-#: admin/systems/services/glpi/class_glpiAccount.inc:166
-msgid "Can't connect to glpi database, check configuration twice."
-msgstr ""
-"Impossible de se connecter à la base de données glpi, veuillez vérifier la "
-"configuration."
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
-#: admin/systems/services/glpi/class_glpiAccount.inc:181
-msgid "Download of attachment failed. Attachment was not found on server."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
-#: admin/systems/services/glpi/class_glpiAccount.inc:184
-msgid "Download of attachment failed. Not a valid attachment id."
-msgstr ""
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
+msgid "File"
+msgstr "Fichier"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
-#: admin/systems/services/glpi/class_glpiAccount.inc:593
-msgid "Remove inventory"
-msgstr "Supprimer l'inventaire"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
+msgid "Upload"
+msgstr "Télécharger"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Ce serveur à l'extension inventaire activée. Vous pouvez la désactiver en "
-"cliquant sur le bouton ci-dessous."
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
+msgid "Status"
+msgstr "Statut"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
-#: admin/systems/services/glpi/class_glpiAccount.inc:596
-msgid "Add inventory"
-msgstr "Ajouter l'inventaire"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
+msgid "Filename"
+msgstr "Nom du fichier"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
-msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Ce serveur à l'extension d'inventaire désactivé. Vous pouvez l'activer en "
-"cliquant sur le bouton ci-dessous."
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
+msgstr "Type mime"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
-#, php-format
-msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
-msgstr ""
-"Impossible de renommer le type d'imprimante en '%s', ce type existe déjà."
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
+#, fuzzy
+msgid "cartridge"
+msgstr "Cartouches"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
 #, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
+msgid ""
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
 msgstr ""
-"Impossible d'effacer ce type d'imprimante, il est encore utilisé par '%s'"
+"Vous ne pouvez pas effacer ce type de cartouche, il est utilisé actuellement "
+"par ce(s) imprimante(s) '%s'."
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
-#: admin/systems/services/glpi/class_glpiAccount.inc:656
-#: admin/systems/services/glpi/class_glpiAccount.inc:671
-msgid "N/A"
-msgstr "N/A"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
+msgid "Cartridges"
+msgstr "Cartouches"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
-msgid "since"
-msgstr "depuis"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
+msgid "Action"
+msgstr "Action"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
-#: admin/systems/services/glpi/class_glpiAccount.inc:793
-msgid "Glpi"
-msgstr ""
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
+msgid "Delete"
+msgstr "Supprimer"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
-msgid "Printer inventory extension"
-msgstr "Ajouter une extension d'inventaire d'imprimante"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
+msgid "New monitor"
+msgstr "Nouvel écran"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
-msgid "Supports serial interface"
-msgstr "Supporte une Interface série"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
+msgid "M"
+msgstr "M"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
-msgid "Supports parallel interface"
-msgstr "Supporte une interface parallèle"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr ""
+"Vous ne pouvez pas effacer ce fournisseur, il est utilisé actuellement par ce"
+"(s) système(s) '%s'"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
-msgid "Supports usb interface"
-msgstr "Supporte une interface usb"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
+msgid "Please specify a name."
+msgstr "Veuillez indiquer un nom."
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
-#: admin/systems/services/glpi/glpi_devices.tpl:17
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
-msgid "Comments"
-msgstr "Commentaires"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
+msgid "Specified name is already in use, please choose another one."
+msgstr "Le nom indiqué est déjà utilisé, veuillez en choisir un autre."
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
-#: admin/systems/services/glpi/class_glpiAccount.inc:805
-msgid "Location"
-msgstr "Lieu"
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
+msgstr "Référence"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
 #: admin/systems/services/glpi/glpi_devices.tpl:427
 #: admin/systems/services/glpi/glpi_devices.tpl:492
 #: admin/systems/services/glpi/glpi_devices.tpl:542
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
 #: admin/systems/services/glpi/class_glpiAccount.inc:808
 msgid "Type"
 msgstr "Type"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
-msgid "Cartridge settings"
-msgstr "Paramètre des cartouches"
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
+msgid "Choose"
+msgstr "Choisir"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:2
-msgid "Warning"
-msgstr "Avertissement"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:32
+#: admin/systems/services/glpi/class_goGlpiServer.inc:87
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
+msgid "Inventory database"
+msgstr "Base de données de l'inventaire"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Veuillez vous assurez que vous voulez effectuer cette opération. Toutes les "
-"données seront perdues étant donné qu'il est impossible pour GOsa de "
-"récupérer vos données."
+#: admin/systems/services/glpi/class_goGlpiServer.inc:58
+msgid "Inventory database service"
+msgstr "Service de la base de données d'inventaire"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: admin/systems/services/glpi/class_goGlpiServer.inc:67
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "L'attribut utilisateur est vide ou contient des caractères invalides."
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:70
+msgid "The attribute database is empty or contains invalid characters."
 msgstr ""
-"Il est conseillé de sauvegarder le contenu de votre base de données MySql "
-"dans un fichier avant de réaliser cette action. Donc - si vous avez fait "
-"cela - appuyez sur 'Supprimer' pour continuer ou 'Annuler' pour abandonner."
+"L'attribut base de données est vide ou contient des caractères invalides."
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
+msgid "Services"
+msgstr "Services"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:96
+msgid "Start"
+msgstr "Démarrage"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:97
+msgid "Stop"
+msgstr "Arrêter"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:98
+msgid "Restart"
+msgstr "Réessayer"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:100
+msgid "Admin"
+msgstr "Administrateur"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:101
+#: admin/systems/services/glpi/goGlpiServer.tpl:20
+msgid "Database"
+msgstr "Base de données"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:102
+#: admin/systems/services/glpi/goGlpiServer.tpl:12
+msgid "Password"
+msgstr "Mot de passe"
 
 #: admin/systems/services/glpi/glpi_devices.tpl:2
 msgid "Add/Edit monitor"
 msgstr "Ajouter/Modifier un écran"
 
-#: admin/systems/services/glpi/glpi_devices.tpl:10
-#: admin/systems/services/glpi/glpi_devices.tpl:105
-#: admin/systems/services/glpi/glpi_devices.tpl:146
-#: admin/systems/services/glpi/glpi_devices.tpl:201
-#: admin/systems/services/glpi/glpi_devices.tpl:257
-#: admin/systems/services/glpi/glpi_devices.tpl:315
-#: admin/systems/services/glpi/glpi_devices.tpl:379
-#: admin/systems/services/glpi/glpi_devices.tpl:451
-#: admin/systems/services/glpi/glpi_devices.tpl:515
-#: admin/systems/services/glpi/glpi_devices.tpl:562
-#: admin/systems/services/glpi/glpi_devices.tpl:615
-#: admin/systems/services/glpi/glpi_devices.tpl:669
-#: admin/systems/services/glpi/glpi_devices.tpl:715
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
-msgid "Name"
-msgstr "Nom"
-
 #: admin/systems/services/glpi/glpi_devices.tpl:33
 msgid "Monitor size"
 msgstr "Taille écran"
@@ -491,86 +620,25 @@ msgstr "Ajouter/Modifier un processeur"
 msgid "Frequence"
 msgstr "Fréquence"
 
-#: admin/systems/services/glpi/glpi_devices.tpl:649
-msgid "Default frequence"
-msgstr "Fréquence par défaut"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:661
-msgid "Add/Edit motherboard"
-msgstr "Ajouter/Modifier une carte mère"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:696
-msgid "Chipset"
-msgstr "Jeu de composants"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:707
-msgid "Add/Edit computer case"
-msgstr "Ajouter/Modifier un Boîtier"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:742
-msgid "format"
-msgstr "format"
-
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
-#: admin/systems/services/glpi/glpi_edit_os.tpl:9
-#: admin/systems/services/glpi/glpi_edit_os.tpl:28
-#: admin/systems/services/glpi/glpi_edit_type.tpl:9
-#: admin/systems/services/glpi/glpi_edit_type.tpl:28
-msgid "Rename"
-msgstr "Renommer"
-
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
-#: admin/systems/services/glpi/glpiManufacturer.tpl:13
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
-#: admin/systems/services/glpi/glpi_edit_os.tpl:15
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
-#: admin/systems/services/glpi/glpi_edit_type.tpl:15
-msgid "Close"
-msgstr "Fermer"
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:1
-msgid "Manage manufacturers"
-msgstr "Gérer les Fabricants"
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:8
-#: admin/systems/services/glpi/glpiPrinter.tpl:152
-msgid "Remove"
-msgstr "Supprimer"
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
-msgid "List of devices"
-msgstr "Liste des périphériques"
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
-msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
-msgstr ""
-"Ce menu vous permet d'attacher un périphérique à votre ordinateur en cours "
-"d'édition."
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
-msgid "Display devices matching"
-msgstr "Afficher les périphériques correspondants"
+#: admin/systems/services/glpi/glpi_devices.tpl:649
+msgid "Default frequence"
+msgstr "Fréquence par défaut"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
-msgid "Regular expression for matching device names"
-msgstr "Expression régulière concordant avec les noms des périphériques"
+#: admin/systems/services/glpi/glpi_devices.tpl:661
+msgid "Add/Edit motherboard"
+msgstr "Ajouter/Modifier une carte mère"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
-msgid "Use"
-msgstr "Utiliser"
+#: admin/systems/services/glpi/glpi_devices.tpl:696
+msgid "Chipset"
+msgstr "Jeu de composants"
 
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
-#: admin/systems/services/glpi/glpi_edit_os.tpl:24
-#: admin/systems/services/glpi/glpi_edit_type.tpl:24
-msgid "Please enter a new name"
-msgstr "Veuillez entrer un nouveau nom"
+#: admin/systems/services/glpi/glpi_devices.tpl:707
+msgid "Add/Edit computer case"
+msgstr "Ajouter/Modifier un Boîtier"
+
+#: admin/systems/services/glpi/glpi_devices.tpl:742
+msgid "format"
+msgstr "format"
 
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:88
 #, php-format
@@ -599,26 +667,6 @@ msgstr ""
 msgid "devices"
 msgstr "périphériques"
 
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
-msgid "Actions"
-msgstr "Actions"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
-msgid "Delete"
-msgstr "Supprimer"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-msgid "New monitor"
-msgstr "Nouvel écran"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-msgid "M"
-msgstr "M"
-
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:223
 msgid "New mainbord"
 msgstr "Nouvelle carte mère"
@@ -736,69 +784,59 @@ msgstr "Aucun"
 msgid "Other"
 msgstr "Autres"
 
-#: admin/systems/services/glpi/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
-msgstr "Gérer les types de systèmes d'exploitation"
-
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
-msgid "Add/Edit manufacturer"
-msgstr "Ajouter/Modifier un fabricant"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:6
+msgid "List of users"
+msgstr "Liste des utilisateurs"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
-msgid "Website"
-msgstr "Site web"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
+msgstr ""
+"Ce dialogue vous permet de désigner un utilisateur comme personne "
+"responsable."
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
-msgid "Address"
-msgstr "Adresse"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:27
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
+msgid "Filters"
+msgstr "Filtres"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
-msgid "Phone number"
-msgstr "Numéro de téléphone"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:35
+msgid "Display users matching"
+msgstr "Afficher les utilisateurs correspondants"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
-msgid "Fax"
-msgstr "Fax"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:37
+msgid "Regular expression for matching user names"
+msgstr "Expression régulière concordant avec les noms des utilisateurs"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr "Adresse de messagerie"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
+msgstr "Liste des documents liés"
 
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
-#, php-format
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
 msgstr ""
-"Vous ne pouvez pas effacer ce fournisseur, il est utilisé actuellement par ce"
-"(s) système(s) '%s'"
-
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
-msgid "Please specify a name."
-msgstr "Veuillez indiquer un nom."
-
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
-msgid "Specified name is already in use, please choose another one."
-msgstr "Le nom indiqué est déjà utilisé, veuillez en choisir un autre."
-
-#: admin/systems/services/glpi/goGlpiServer.tpl:1
-msgid "GLPI database information"
-msgstr "Information sur la base de données GLPI"
+"Ce menu vous permet d'attacher des objets supplémentaires ( comme des "
+"manuels, guides, etc..) à l'ordinateur que vous être en train d'éditer."
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:4
-msgid "Logging DB user"
-msgstr "Utilisateur de la base de données des journaux systèmes"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
+msgid "Display attachments matching"
+msgstr "Afficher les documents liées correspondants"
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:12
-#: admin/systems/services/glpi/class_goGlpiServer.inc:102
-msgid "Password"
-msgstr "Mot de passe"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
+msgid "Regular expression for matching attachment names"
+msgstr "Expression régulière pour faire correspondre le nom des documents liés"
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:20
-#: admin/systems/services/glpi/class_goGlpiServer.inc:101
-msgid "Database"
-msgstr "Base de données"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
+msgid "Use"
+msgstr "Utiliser"
 
 #: admin/systems/services/glpi/glpiPrinterCartridges.tpl:6
 msgid "List of available cartridge type for this type of printer"
@@ -827,71 +865,173 @@ msgstr "Afficher les types de cartouches correspondantes"
 msgid "Regular expression for matching cartridge types"
 msgstr "Expression régulière pour sélectionner les cartouches correspondantes"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
-#, fuzzy
-msgid "cartridge"
-msgstr "Cartouches"
+#: admin/systems/services/glpi/goGlpiServer.tpl:1
+msgid "GLPI database information"
+msgstr "Information sur la base de données GLPI"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
+#: admin/systems/services/glpi/goGlpiServer.tpl:4
+msgid "Logging DB user"
+msgstr "Utilisateur de la base de données des journaux systèmes"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
+#: admin/systems/services/glpi/class_glpiAccount.inc:146
+msgid "There is no server with valid glpi database service."
+msgstr "Il n'y a pas de serveur qui contient un service glpi valide."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
+#: admin/systems/services/glpi/class_glpiAccount.inc:156
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr ""
+"Impossible de se connecter sur la base de données glpi, l'extension php-"
+"mysql n'est pas disponible."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
+#: admin/systems/services/glpi/class_glpiAccount.inc:166
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr ""
+"Impossible de se connecter à la base de données glpi, veuillez vérifier la "
+"configuration."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
+#: admin/systems/services/glpi/class_glpiAccount.inc:181
+msgid "Download of attachment failed. Attachment was not found on server."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
+#: admin/systems/services/glpi/class_glpiAccount.inc:184
+msgid "Download of attachment failed. Not a valid attachment id."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
+#: admin/systems/services/glpi/class_glpiAccount.inc:593
+msgid "Remove inventory"
+msgstr "Supprimer l'inventaire"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Ce serveur à l'extension inventaire activée. Vous pouvez la désactiver en "
+"cliquant sur le bouton ci-dessous."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
+#: admin/systems/services/glpi/class_glpiAccount.inc:596
+msgid "Add inventory"
+msgstr "Ajouter l'inventaire"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Ce serveur à l'extension d'inventaire désactivé. Vous pouvez l'activer en "
+"cliquant sur le bouton ci-dessous."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
 #, php-format
 msgid ""
-"You can't delete this cartridge type, it is still in use by this printer(s) "
-"'%s'."
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
 msgstr ""
-"Vous ne pouvez pas effacer ce type de cartouche, il est utilisé actuellement "
-"par ce(s) imprimante(s) '%s'."
+"Impossible de renommer le type d'imprimante en '%s', ce type existe déjà."
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
-msgid "Cartridges"
-msgstr "Cartouches"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr ""
+"Impossible d'effacer ce type d'imprimante, il est encore utilisé par '%s'"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
+msgid "since"
+msgstr "depuis"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
+#: admin/systems/services/glpi/class_glpiAccount.inc:793
+msgid "Glpi"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
+msgid "Printer inventory extension"
+msgstr "Ajouter une extension d'inventaire d'imprimante"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
+msgid "Supports serial interface"
+msgstr "Supporte une Interface série"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
+msgid "Supports parallel interface"
+msgstr "Supporte une interface parallèle"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
+msgid "Supports usb interface"
+msgstr "Supporte une interface usb"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
-msgid "Action"
-msgstr "Action"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
+#: admin/systems/services/glpi/class_glpiAccount.inc:805
+msgid "Location"
+msgstr "Lieu"
 
-#: admin/systems/services/glpi/glpi_edit_type.tpl:1
-msgid "Manage System-types"
-msgstr "Gérer le type de système"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
+msgid "Cartridge settings"
+msgstr "Paramètre des cartouches"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
-msgid "Can't delete this entry, it is still in use."
-msgstr "Impossible d'effacer cette entrée elle est encore utilisée"
+#: admin/systems/services/glpi/glpi.tpl:9
+msgid "System type"
+msgstr "Type de système"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
-msgid "The selected name is already in use."
-msgstr "Le nom spécifié est déjà utilisé."
+#: admin/systems/services/glpi/glpi.tpl:23
+#: admin/systems/services/glpi/class_glpiAccount.inc:804
+msgid "Operating system"
+msgstr "Système d'exploitation"
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
-msgid "Reference"
-msgstr "Référence"
+#: admin/systems/services/glpi/glpi.tpl:96
+msgid "Installed devices"
+msgstr "Périphériques installés"
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
-msgid "Choose"
-msgstr "Choisir"
+#: admin/systems/services/glpi/glpi.tpl:112
+msgid "Trading"
+msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
-msgid "Attachment"
-msgstr "Document lié"
+#: admin/systems/services/glpi/glpi.tpl:113
+msgid "Software"
+msgstr "Logiciel"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
-msgid "File"
-msgstr "Fichier"
+#: admin/systems/services/glpi/glpi.tpl:114
+msgid "Contracts"
+msgstr "Contrats"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
-msgid "Upload"
-msgstr "Télécharger"
+#: admin/systems/services/glpi/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
+msgstr "Gérer les types de systèmes d'exploitation"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
-msgid "Status"
-msgstr "Statut"
+#: admin/systems/services/glpi/remove_glpi.tpl:2
+msgid "Warning"
+msgstr "Avertissement"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
-msgid "Filename"
-msgstr "Nom du fichier"
+#: admin/systems/services/glpi/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Veuillez vous assurez que vous voulez effectuer cette opération. Toutes les "
+"données seront perdues étant donné qu'il est impossible pour GOsa de "
+"récupérer vos données."
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
-msgid "Mime-type"
-msgstr "Type mime"
+#: admin/systems/services/glpi/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Il est conseillé de sauvegarder le contenu de votre base de données MySql "
+"dans un fichier avant de réaliser cette action. Donc - si vous avez fait "
+"cela - appuyez sur 'Supprimer' pour continuer ou 'Annuler' pour abandonner."
+
+#: admin/systems/services/glpi/glpiManufacturer.tpl:1
+msgid "Manage manufacturers"
+msgstr "Gérer les Fabricants"
 
 #: admin/systems/services/glpi/class_glpiAccount.inc:198
 #: admin/systems/services/glpi/class_glpiAccount.inc:204
@@ -981,50 +1121,6 @@ msgstr "Modèle"
 msgid "Peripheral devices"
 msgstr "Périphériques externes"
 
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
-msgid "List of attachments"
-msgstr "Liste des documents liés"
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
-msgstr ""
-"Ce menu vous permet d'attacher des objets supplémentaires ( comme des "
-"manuels, guides, etc..) à l'ordinateur que vous être en train d'éditer."
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
-msgid "Display attachments matching"
-msgstr "Afficher les documents liées correspondants"
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
-msgid "Regular expression for matching attachment names"
-msgstr "Expression régulière pour faire correspondre le nom des documents liés"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:9
-msgid "Printer type"
-msgstr "Type de l'imprimante"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:39
-msgid "Supported interfaces"
-msgstr "Interfaces supportées"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:48
-msgid "Serial"
-msgstr "Série"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:58
-msgid "Parallel"
-msgstr "Parallèle"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:68
-msgid "USB"
-msgstr "USB"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:139
-msgid "Installed cartridges"
-msgstr "Cartouches installés"
-
 #: admin/systems/services/glpi/class_glpiSelectUser.inc:108
 msgid "Users"
 msgstr "Utilisateurs"
@@ -1078,120 +1174,24 @@ msgstr "Base"
 msgid "Submit department"
 msgstr "Soumettre le département"
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
-#, fuzzy
-msgid "attachment"
-msgstr "Document lié"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
+msgid "List of devices"
+msgstr "Liste des périphériques"
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
-#, php-format
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
 msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
-msgstr ""
-"Impossible d'effacer ce fichier attaché, tant qu'il est utilisé par ce(s) "
-"système(s) '%s'."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
-msgid "There is no valid file uploaded."
-msgstr "Pas de fichier valide téléchargé."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
-msgid "Upload wasn't successfull."
-msgstr "Le téléchargement n'a pas réussi."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
-#, php-format
-msgid "Missing directory '%s/glpi/' to store glpi uploads."
-msgstr "Le répertoire de téléchargement pour gpli '%s/glpi' est manquant."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
-msgid "There is already a file with the same name uploaded."
-msgstr "Il existe déjà un fichier avec ce nom."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
-#, php-format
-msgid "Can't create file '%s'."
-msgstr "Impossible de créer le fichier '%s'."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
-msgid "File is available."
-msgstr "Le fichier est disponible."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
-msgid "File is not readable, possibly the file is missing."
-msgstr "Le fichier n'est pas lisible, il est probablement manquant."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
-msgid "Currently no file uploaded."
-msgstr "Pas de fichier téléchargé."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
-msgid "Mime"
-msgstr "Mime"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
-msgid "This table displays all available attachments."
-msgstr "Ce tableau montre tout les fichiers attachés disponibles."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
-msgid "empty"
-msgstr "vide"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
-msgid "Create new attachment"
-msgstr "Créer un nouveau fichier attaché"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
-msgid "New Attachment"
-msgstr "Nouveau document lié"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
-msgid "This name is already in use."
-msgstr "Le nom spécifié est déjà utilisé."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
-msgid "Please specify a valid name for this attachment."
-msgstr "Veuillez spécifier un nom valide pour ce document lié."
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:32
-#: admin/systems/services/glpi/class_goGlpiServer.inc:87
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-msgid "Inventory database"
-msgstr "Base de données de l'inventaire"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:58
-msgid "Inventory database service"
-msgstr "Service de la base de données d'inventaire"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:67
-msgid "The attribute user is empty or contains invalid characters."
-msgstr "L'attribut utilisateur est vide ou contient des caractères invalides."
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:70
-msgid "The attribute database is empty or contains invalid characters."
+"This dialog allows you to attach a device to your currently edited computer."
 msgstr ""
-"L'attribut base de données est vide ou contient des caractères invalides."
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-msgid "Services"
-msgstr "Services"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:96
-msgid "Start"
-msgstr "Démarrage"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:97
-msgid "Stop"
-msgstr "Arrêter"
+"Ce menu vous permet d'attacher un périphérique à votre ordinateur en cours "
+"d'édition."
 
-#: admin/systems/services/glpi/class_goGlpiServer.inc:98
-msgid "Restart"
-msgstr "Réessayer"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
+msgid "Display devices matching"
+msgstr "Afficher les périphériques correspondants"
 
-#: admin/systems/services/glpi/class_goGlpiServer.inc:100
-msgid "Admin"
-msgstr "Administrateur"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
+msgid "Regular expression for matching device names"
+msgstr "Expression régulière concordant avec les noms des périphériques"
 
 #~ msgid "You're about to delete the glpi attachment component '%s'."
 #~ msgstr "Vous êtes sur le point de supprimer le composant glpi attaché '%s'."
index 56775f1ee65341f4b3972cd9f521f4428bb7ecfd..12b74a0fe938d1780695cce9b2423c3913c5307d 100644 (file)
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-14 13:40+0100\n"
+"POT-Creation-Date: 2008-04-03 16:04+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -15,68 +15,181 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:6
-msgid "List of users"
-msgstr "Lista degli utenti"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
+#, fuzzy
+msgid "Add/Edit manufacturer"
+msgstr "Modifica contatto"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:20
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
-#: admin/systems/services/glpi/glpiPrinter.tpl:127
-msgid "Information"
-msgstr "Informazioni"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
+#: admin/systems/services/glpi/glpi_devices.tpl:10
+#: admin/systems/services/glpi/glpi_devices.tpl:105
+#: admin/systems/services/glpi/glpi_devices.tpl:146
+#: admin/systems/services/glpi/glpi_devices.tpl:201
+#: admin/systems/services/glpi/glpi_devices.tpl:257
+#: admin/systems/services/glpi/glpi_devices.tpl:315
+#: admin/systems/services/glpi/glpi_devices.tpl:379
+#: admin/systems/services/glpi/glpi_devices.tpl:451
+#: admin/systems/services/glpi/glpi_devices.tpl:515
+#: admin/systems/services/glpi/glpi_devices.tpl:562
+#: admin/systems/services/glpi/glpi_devices.tpl:615
+#: admin/systems/services/glpi/glpi_devices.tpl:669
+#: admin/systems/services/glpi/glpi_devices.tpl:715
+msgid "Name"
+msgstr "Cognome"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:23
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
+#, fuzzy
+msgid "Website"
+msgstr "scrivere"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
+msgid "Address"
+msgstr "Indirizzo"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
+msgid "Phone number"
+msgstr "Numero di telefono"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
+msgid "Fax"
+msgstr "Fax"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr "Indirizzo email"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
+#: admin/systems/services/glpi/glpi_devices.tpl:17
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
+#, fuzzy
+msgid "Comments"
+msgstr "Contenuti"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
+#: admin/systems/services/glpi/glpi_edit_type.tpl:15
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
+#: admin/systems/services/glpi/glpi_edit_os.tpl:15
+#: admin/systems/services/glpi/glpiManufacturer.tpl:13
+#, fuzzy
+msgid "Close"
+msgstr "Scegli"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
+#, fuzzy
+msgid "attachment"
+msgstr "Argomenti"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
+#, php-format
 msgid ""
-"This dialog allows you to select a user as technical responsible person."
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:27
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
-msgid "Filters"
-msgstr "Filtri"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
+#, fuzzy
+msgid "There is no valid file uploaded."
+msgstr "Prego inserire un numero di telefono valido!"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:35
-msgid "Display users matching"
-msgstr "Mostra utenti che corrispondono a"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
+msgid "Upload wasn't successfull."
+msgstr ""
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:37
-msgid "Regular expression for matching user names"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
+#, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:6
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
+#, fuzzy
+msgid "There is already a file with the same name uploaded."
+msgstr "Prego inserire un numero di telefono valido!"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
+#, fuzzy, php-format
+msgid "Can't create file '%s'."
+msgstr "Rimuovi"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
+msgid "File is available."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
+msgid "File is not readable, possibly the file is missing."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
+msgid "Currently no file uploaded."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
+#, fuzzy
+msgid "Mime"
+msgstr "Cellulare"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
+msgid "Actions"
+msgstr "Azioni"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
+msgid "This table displays all available attachments."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
+#, fuzzy
+msgid "empty"
+msgstr "Riprova"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
+#, fuzzy
+msgid "Create new attachment"
+msgstr "Lista dei dipartimenti"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
+#, fuzzy
+msgid "New Attachment"
+msgstr "Argomenti"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
+#, fuzzy
+msgid "This name is already in use."
+msgstr "L'indirizzo principale inserito è già in uso."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
+#, fuzzy
+msgid "Please specify a valid name for this attachment."
+msgstr "Specificare una dimenzione valida per le mail da rigettare."
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:6
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:4
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:34
-#: admin/systems/services/glpi/glpiPrinter.tpl:6
+#: admin/systems/services/glpi/glpi.tpl:6
 msgid "Generic"
 msgstr "Generale"
 
-#: admin/systems/services/glpi/glpi.tpl:9
+#: admin/systems/services/glpi/glpiPrinter.tpl:9
 #, fuzzy
-msgid "System type"
-msgstr "Sistemi"
+msgid "Printer type"
+msgstr "Nome della stampante"
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:18
+#: admin/systems/services/glpi/glpiPrinter.tpl:32
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
 #: admin/systems/services/glpi/glpi.tpl:18
 #: admin/systems/services/glpi/glpi.tpl:32
 #: admin/systems/services/glpi/glpi.tpl:46
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
-#: admin/systems/services/glpi/glpiPrinter.tpl:18
-#: admin/systems/services/glpi/glpiPrinter.tpl:32
 msgid "edit"
 msgstr "modifica"
 
-#: admin/systems/services/glpi/glpi.tpl:23
-#: admin/systems/services/glpi/class_glpiAccount.inc:804
-#, fuzzy
-msgid "Operating system"
-msgstr "Rimuovi"
-
-#: admin/systems/services/glpi/glpi.tpl:37
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpiPrinter.tpl:23
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
 #: admin/systems/services/glpi/glpi_devices.tpl:24
 #: admin/systems/services/glpi/glpi_devices.tpl:123
 #: admin/systems/services/glpi/glpi_devices.tpl:164
@@ -90,264 +203,309 @@ msgstr "Rimuovi"
 #: admin/systems/services/glpi/glpi_devices.tpl:633
 #: admin/systems/services/glpi/glpi_devices.tpl:687
 #: admin/systems/services/glpi/glpi_devices.tpl:733
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpi.tpl:37
 #: admin/systems/services/glpi/class_glpiAccount.inc:809
-#: admin/systems/services/glpi/glpiPrinter.tpl:23
 msgid "Manufacturer"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:52
+#: admin/systems/services/glpi/glpiPrinter.tpl:39
+#, fuzzy
+msgid "Supported interfaces"
+msgstr "Mostra dispositiva di rete"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:48
+#, fuzzy
+msgid "Serial"
+msgstr "Terminali"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:58
+msgid "Parallel"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:68
+msgid "USB"
+msgstr ""
+
 #: admin/systems/services/glpi/glpiPrinter.tpl:80
+#: admin/systems/services/glpi/glpi.tpl:52
 #, fuzzy
 msgid "Contacts"
 msgstr "Contatto"
 
-#: admin/systems/services/glpi/glpi.tpl:56
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
-#: admin/systems/services/glpi/class_glpiAccount.inc:806
-#: admin/systems/services/glpi/glpiPrinter.tpl:94
-#, fuzzy
-msgid "Contact person"
-msgstr "Contatto"
+#: admin/systems/services/glpi/glpiPrinter.tpl:83
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
+#: admin/systems/services/glpi/glpi.tpl:66
+#: admin/systems/services/glpi/class_glpiAccount.inc:802
+msgid "Technical responsible"
+msgstr ""
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:88
+#: admin/systems/services/glpi/glpiPrinter.tpl:99
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
 #: admin/systems/services/glpi/glpi.tpl:61
 #: admin/systems/services/glpi/glpi.tpl:71
 #: admin/systems/services/glpi/glpi.tpl:106
 #: admin/systems/services/glpi/glpiManufacturer.tpl:7
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
-#: admin/systems/services/glpi/glpiPrinter.tpl:88
-#: admin/systems/services/glpi/glpiPrinter.tpl:99
 msgid "Edit"
 msgstr "Modifica"
 
-#: admin/systems/services/glpi/glpi.tpl:66
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
-#: admin/systems/services/glpi/class_glpiAccount.inc:802
-#: admin/systems/services/glpi/glpiPrinter.tpl:83
-msgid "Technical responsible"
-msgstr ""
+#: admin/systems/services/glpi/glpiPrinter.tpl:94
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
+#: admin/systems/services/glpi/glpi.tpl:56
+#: admin/systems/services/glpi/class_glpiAccount.inc:806
+#, fuzzy
+msgid "Contact person"
+msgstr "Contatto"
 
-#: admin/systems/services/glpi/glpi.tpl:79
-#: admin/systems/services/glpi/glpi_devices.tpl:112
-#: admin/systems/services/glpi/glpi_devices.tpl:153
-#: admin/systems/services/glpi/glpi_devices.tpl:208
-#: admin/systems/services/glpi/glpi_devices.tpl:264
-#: admin/systems/services/glpi/glpi_devices.tpl:322
-#: admin/systems/services/glpi/glpi_devices.tpl:386
-#: admin/systems/services/glpi/glpi_devices.tpl:458
-#: admin/systems/services/glpi/glpi_devices.tpl:522
-#: admin/systems/services/glpi/glpi_devices.tpl:569
-#: admin/systems/services/glpi/glpi_devices.tpl:622
-#: admin/systems/services/glpi/glpi_devices.tpl:676
-#: admin/systems/services/glpi/glpi_devices.tpl:722
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
-#: admin/systems/services/glpi/class_glpiAccount.inc:803
+#: admin/systems/services/glpi/glpiPrinter.tpl:107
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
+#: admin/systems/services/glpi/glpi.tpl:117
+#: admin/systems/services/glpi/class_glpiAccount.inc:810
 #, fuzzy
-msgid "Comment"
-msgstr "Contenuti"
+msgid "Attachments"
+msgstr "Argomenti"
 
-#: admin/systems/services/glpi/glpi.tpl:96
+#: admin/systems/services/glpi/glpiPrinter.tpl:127
+#: admin/systems/services/glpi/glpiSelectUser.tpl:20
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
+msgid "Information"
+msgstr "Informazioni"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:139
 #, fuzzy
-msgid "Installed devices"
+msgid "Installed cartridges"
 msgstr "Dispositivi del client"
 
-#: admin/systems/services/glpi/glpi.tpl:112
-#, fuzzy
-msgid "Trading"
-msgstr "Ricerca"
+#: admin/systems/services/glpi/glpiPrinter.tpl:152
+#: admin/systems/services/glpi/glpiManufacturer.tpl:8
+msgid "Remove"
+msgstr "Rimuovi"
 
-#: admin/systems/services/glpi/glpi.tpl:113
+#: admin/systems/services/glpi/glpi_edit_type.tpl:1
 #, fuzzy
-msgid "Software"
-msgstr "Stato"
+msgid "Manage System-types"
+msgstr "Sistemi"
 
-#: admin/systems/services/glpi/glpi.tpl:114
+#: admin/systems/services/glpi/glpi_edit_type.tpl:9
+#: admin/systems/services/glpi/glpi_edit_type.tpl:28
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
+#: admin/systems/services/glpi/glpi_edit_os.tpl:9
+#: admin/systems/services/glpi/glpi_edit_os.tpl:28
 #, fuzzy
-msgid "Contracts"
-msgstr "Contatto"
+msgid "Rename"
+msgstr "Cognome"
 
-#: admin/systems/services/glpi/glpi.tpl:117
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
-#: admin/systems/services/glpi/class_glpiAccount.inc:810
-#: admin/systems/services/glpi/glpiPrinter.tpl:107
+#: admin/systems/services/glpi/glpi_edit_type.tpl:24
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
+#: admin/systems/services/glpi/glpi_edit_os.tpl:24
 #, fuzzy
-msgid "Attachments"
-msgstr "Argomenti"
+msgid "Please enter a new name"
+msgstr "Inserisci la URI del server LDAP"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
-#: admin/systems/services/glpi/class_glpiAccount.inc:146
-msgid "There is no server with valid glpi database service."
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
+msgid "Can't delete this entry, it is still in use."
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
-#: admin/systems/services/glpi/class_glpiAccount.inc:156
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
+#: admin/systems/services/glpi/class_glpiAccount.inc:656
+#: admin/systems/services/glpi/class_glpiAccount.inc:671
+msgid "N/A"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
-#: admin/systems/services/glpi/class_glpiAccount.inc:166
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
 #, fuzzy
-msgid "Can't connect to glpi database, check configuration twice."
-msgstr "Impossibile connettersi al server del database!"
+msgid "The selected name is already in use."
+msgstr "L'indirizzo principale inserito è già in uso."
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
-#: admin/systems/services/glpi/class_glpiAccount.inc:181
-msgid "Download of attachment failed. Attachment was not found on server."
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
+#, fuzzy
+msgid "Attachment"
+msgstr "Argomenti"
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
+#: admin/systems/services/glpi/glpi_devices.tpl:112
+#: admin/systems/services/glpi/glpi_devices.tpl:153
+#: admin/systems/services/glpi/glpi_devices.tpl:208
+#: admin/systems/services/glpi/glpi_devices.tpl:264
+#: admin/systems/services/glpi/glpi_devices.tpl:322
+#: admin/systems/services/glpi/glpi_devices.tpl:386
+#: admin/systems/services/glpi/glpi_devices.tpl:458
+#: admin/systems/services/glpi/glpi_devices.tpl:522
+#: admin/systems/services/glpi/glpi_devices.tpl:569
+#: admin/systems/services/glpi/glpi_devices.tpl:622
+#: admin/systems/services/glpi/glpi_devices.tpl:676
+#: admin/systems/services/glpi/glpi_devices.tpl:722
+#: admin/systems/services/glpi/glpi.tpl:79
+#: admin/systems/services/glpi/class_glpiAccount.inc:803
+#, fuzzy
+msgid "Comment"
+msgstr "Contenuti"
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
+msgid "File"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
-#: admin/systems/services/glpi/class_glpiAccount.inc:184
-msgid "Download of attachment failed. Not a valid attachment id."
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
+msgid "Upload"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
-#: admin/systems/services/glpi/class_glpiAccount.inc:593
-#, fuzzy
-msgid "Remove inventory"
-msgstr "Elimina contatto"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
+msgid "Status"
+msgstr "Stato"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
 #, fuzzy
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
-msgstr "Questa identià possiede estensioni Unix."
+msgid "Filename"
+msgstr "Cognome"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
-#: admin/systems/services/glpi/class_glpiAccount.inc:596
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
 #, fuzzy
-msgid "Add inventory"
-msgstr "Aggiungi contatto"
+msgid "Mime-type"
+msgstr "Tipo"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
 #, fuzzy
-msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
-msgstr "Questa identità non possiede estensioni Unix"
+msgid "cartridge"
+msgstr "Dispositivi del client"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
 #, php-format
 msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
-#: admin/systems/services/glpi/class_glpiAccount.inc:656
-#: admin/systems/services/glpi/class_glpiAccount.inc:671
-msgid "N/A"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
+msgid "Cartridges"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
-msgid "since"
-msgstr ""
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
+msgid "Action"
+msgstr "Azione"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
-#: admin/systems/services/glpi/class_glpiAccount.inc:793
-msgid "Glpi"
-msgstr ""
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
+msgid "Delete"
+msgstr "Rimuovi"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
 #, fuzzy
-msgid "Printer inventory extension"
-msgstr "Elimina foto"
+msgid "New monitor"
+msgstr "Nuova password"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
 #, fuzzy
-msgid "Supports serial interface"
-msgstr "Mostra dispositiva di rete"
+msgid "M"
+msgstr "Mb"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
-#, fuzzy
-msgid "Supports parallel interface"
-msgstr "Mostra dispositiva di rete"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
 #, fuzzy
-msgid "Supports usb interface"
-msgstr "Mostra dispositiva di rete"
+msgid "Please specify a name."
+msgstr "Prego inserire un numero di telefono valido!"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
-#: admin/systems/services/glpi/glpi_devices.tpl:17
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
-#, fuzzy
-msgid "Comments"
-msgstr "Contenuti"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
+msgid "Specified name is already in use, please choose another one."
+msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
-#: admin/systems/services/glpi/class_glpiAccount.inc:805
-msgid "Location"
-msgstr "Località"
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
+#, fuzzy
+msgid "Reference"
+msgstr "Riferimenti"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
 #: admin/systems/services/glpi/glpi_devices.tpl:427
 #: admin/systems/services/glpi/glpi_devices.tpl:492
 #: admin/systems/services/glpi/glpi_devices.tpl:542
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
 #: admin/systems/services/glpi/class_glpiAccount.inc:808
 msgid "Type"
 msgstr "Tipo"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
+msgid "Choose"
+msgstr "Scegli"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:32
+#: admin/systems/services/glpi/class_goGlpiServer.inc:87
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
 #, fuzzy
-msgid "Cartridge settings"
-msgstr "Opzioni di posta dell'identità"
+msgid "Inventory database"
+msgstr "Database"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:2
-msgid "Warning"
-msgstr "Attenzione"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:58
+#, fuzzy
+msgid "Inventory database service"
+msgstr "Database"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
+#: admin/systems/services/glpi/class_goGlpiServer.inc:67
+#, fuzzy
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: admin/systems/services/glpi/class_goGlpiServer.inc:70
+#, fuzzy
+msgid "The attribute database is empty or contains invalid characters."
+msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
+msgid "Services"
+msgstr "Servizi"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:96
+#, fuzzy
+msgid "Start"
+msgstr "Avvio"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:97
+msgid "Stop"
 msgstr ""
 
+#: admin/systems/services/glpi/class_goGlpiServer.inc:98
+#, fuzzy
+msgid "Restart"
+msgstr "Riprova"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:100
+#, fuzzy
+msgid "Admin"
+msgstr "DN dell'amministratore"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:101
+#: admin/systems/services/glpi/goGlpiServer.tpl:20
+#, fuzzy
+msgid "Database"
+msgstr "Database"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:102
+#: admin/systems/services/glpi/goGlpiServer.tpl:12
+msgid "Password"
+msgstr "Password"
+
 #: admin/systems/services/glpi/glpi_devices.tpl:2
 #, fuzzy
 msgid "Add/Edit monitor"
 msgstr "Modifica contatto"
 
-#: admin/systems/services/glpi/glpi_devices.tpl:10
-#: admin/systems/services/glpi/glpi_devices.tpl:105
-#: admin/systems/services/glpi/glpi_devices.tpl:146
-#: admin/systems/services/glpi/glpi_devices.tpl:201
-#: admin/systems/services/glpi/glpi_devices.tpl:257
-#: admin/systems/services/glpi/glpi_devices.tpl:315
-#: admin/systems/services/glpi/glpi_devices.tpl:379
-#: admin/systems/services/glpi/glpi_devices.tpl:451
-#: admin/systems/services/glpi/glpi_devices.tpl:515
-#: admin/systems/services/glpi/glpi_devices.tpl:562
-#: admin/systems/services/glpi/glpi_devices.tpl:615
-#: admin/systems/services/glpi/glpi_devices.tpl:669
-#: admin/systems/services/glpi/glpi_devices.tpl:715
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
-msgid "Name"
-msgstr "Cognome"
-
 #: admin/systems/services/glpi/glpi_devices.tpl:33
 #, fuzzy
 msgid "Monitor size"
@@ -514,98 +672,31 @@ msgstr "Nuova password"
 #: admin/systems/services/glpi/glpi_devices.tpl:642
 #, fuzzy
 msgid "Frequence"
-msgstr "Numero di telefono"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:649
-#, fuzzy
-msgid "Default frequence"
-msgstr "Stampante predefinita"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:661
-msgid "Add/Edit motherboard"
-msgstr ""
-
-#: admin/systems/services/glpi/glpi_devices.tpl:696
-#, fuzzy
-msgid "Chipset"
-msgstr "reset"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:707
-#, fuzzy
-msgid "Add/Edit computer case"
-msgstr "Computer"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:742
-#, fuzzy
-msgid "format"
-msgstr "Informazioni"
-
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
-#: admin/systems/services/glpi/glpi_edit_os.tpl:9
-#: admin/systems/services/glpi/glpi_edit_os.tpl:28
-#: admin/systems/services/glpi/glpi_edit_type.tpl:9
-#: admin/systems/services/glpi/glpi_edit_type.tpl:28
-#, fuzzy
-msgid "Rename"
-msgstr "Cognome"
-
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
-#: admin/systems/services/glpi/glpiManufacturer.tpl:13
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
-#: admin/systems/services/glpi/glpi_edit_os.tpl:15
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
-#: admin/systems/services/glpi/glpi_edit_type.tpl:15
-#, fuzzy
-msgid "Close"
-msgstr "Scegli"
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:1
-#, fuzzy
-msgid "Manage manufacturers"
-msgstr "Modifica contatto"
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:8
-#: admin/systems/services/glpi/glpiPrinter.tpl:152
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
-#, fuzzy
-msgid "List of devices"
-msgstr "Lista degli utenti"
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
-msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
-msgstr ""
+msgstr "Numero di telefono"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
+#: admin/systems/services/glpi/glpi_devices.tpl:649
 #, fuzzy
-msgid "Display devices matching"
-msgstr "Mostra gli indirizzi che corrispondono"
+msgid "Default frequence"
+msgstr "Stampante predefinita"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
+#: admin/systems/services/glpi/glpi_devices.tpl:661
+msgid "Add/Edit motherboard"
+msgstr ""
+
+#: admin/systems/services/glpi/glpi_devices.tpl:696
 #, fuzzy
-msgid "Regular expression for matching device names"
-msgstr "Espressioni regolare per selezionare il nome del gruppo"
+msgid "Chipset"
+msgstr "reset"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
+#: admin/systems/services/glpi/glpi_devices.tpl:707
 #, fuzzy
-msgid "Use"
-msgstr "Utenti"
+msgid "Add/Edit computer case"
+msgstr "Computer"
 
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
-#: admin/systems/services/glpi/glpi_edit_os.tpl:24
-#: admin/systems/services/glpi/glpi_edit_type.tpl:24
+#: admin/systems/services/glpi/glpi_devices.tpl:742
 #, fuzzy
-msgid "Please enter a new name"
-msgstr "Inserisci la URI del server LDAP"
+msgid "format"
+msgstr "Informazioni"
 
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:88
 #, php-format
@@ -633,28 +724,6 @@ msgstr ""
 msgid "devices"
 msgstr "Dispositivi"
 
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
-msgid "Actions"
-msgstr "Azioni"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
-msgid "Delete"
-msgstr "Rimuovi"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-#, fuzzy
-msgid "New monitor"
-msgstr "Nuova password"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-#, fuzzy
-msgid "M"
-msgstr "Mb"
-
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:223
 #, fuzzy
 msgid "New mainbord"
@@ -788,72 +857,59 @@ msgstr "nessuno"
 msgid "Other"
 msgstr "Filtri"
 
-#: admin/systems/services/glpi/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
-#, fuzzy
-msgid "Add/Edit manufacturer"
-msgstr "Modifica contatto"
-
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
-#, fuzzy
-msgid "Website"
-msgstr "scrivere"
-
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
-msgid "Address"
-msgstr "Indirizzo"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:6
+msgid "List of users"
+msgstr "Lista degli utenti"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
-msgid "Phone number"
-msgstr "Numero di telefono"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
+msgstr ""
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
-msgid "Fax"
-msgstr "Fax"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:27
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
+msgid "Filters"
+msgstr "Filtri"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr "Indirizzo email"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:35
+msgid "Display users matching"
+msgstr "Mostra utenti che corrispondono a"
 
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
-#, php-format
-msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:37
+msgid "Regular expression for matching user names"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
 #, fuzzy
-msgid "Please specify a name."
-msgstr "Prego inserire un numero di telefono valido!"
+msgid "List of attachments"
+msgstr "Lista dei dipartimenti"
 
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
-msgid "Specified name is already in use, please choose another one."
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
+msgid ""
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
 msgstr ""
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:1
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
 #, fuzzy
-msgid "GLPI database information"
-msgstr "Informazioni generali"
-
-#: admin/systems/services/glpi/goGlpiServer.tpl:4
-msgid "Logging DB user"
-msgstr ""
+msgid "Display attachments matching"
+msgstr "Mosra gruppi corrispondenti a"
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:12
-#: admin/systems/services/glpi/class_goGlpiServer.inc:102
-msgid "Password"
-msgstr "Password"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
+#, fuzzy
+msgid "Regular expression for matching attachment names"
+msgstr "Espressioni regolare per selezionare il nome del gruppo"
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:20
-#: admin/systems/services/glpi/class_goGlpiServer.inc:101
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
 #, fuzzy
-msgid "Database"
-msgstr "Database"
+msgid "Use"
+msgstr "Utenti"
 
 #: admin/systems/services/glpi/glpiPrinterCartridges.tpl:6
 msgid "List of available cartridge type for this type of printer"
@@ -878,75 +934,175 @@ msgstr "Mostra utenti che corrispondono a"
 msgid "Regular expression for matching cartridge types"
 msgstr "Espressione regolare per selezionare l'indirizzo"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
+#: admin/systems/services/glpi/goGlpiServer.tpl:1
 #, fuzzy
-msgid "cartridge"
-msgstr "Dispositivi del client"
+msgid "GLPI database information"
+msgstr "Informazioni generali"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
+#: admin/systems/services/glpi/goGlpiServer.tpl:4
+msgid "Logging DB user"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
+#: admin/systems/services/glpi/class_glpiAccount.inc:146
+msgid "There is no server with valid glpi database service."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
+#: admin/systems/services/glpi/class_glpiAccount.inc:156
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
+#: admin/systems/services/glpi/class_glpiAccount.inc:166
+#, fuzzy
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr "Impossibile connettersi al server del database!"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
+#: admin/systems/services/glpi/class_glpiAccount.inc:181
+msgid "Download of attachment failed. Attachment was not found on server."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
+#: admin/systems/services/glpi/class_glpiAccount.inc:184
+msgid "Download of attachment failed. Not a valid attachment id."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
+#: admin/systems/services/glpi/class_glpiAccount.inc:593
+#, fuzzy
+msgid "Remove inventory"
+msgstr "Elimina contatto"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
+#, fuzzy
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
+msgstr "Questa identià possiede estensioni Unix."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
+#: admin/systems/services/glpi/class_glpiAccount.inc:596
+#, fuzzy
+msgid "Add inventory"
+msgstr "Aggiungi contatto"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
+#, fuzzy
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr "Questa identità non possiede estensioni Unix"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
 #, php-format
 msgid ""
-"You can't delete this cartridge type, it is still in use by this printer(s) "
-"'%s'."
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
-msgid "Cartridges"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
+msgid "since"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
+#: admin/systems/services/glpi/class_glpiAccount.inc:793
+msgid "Glpi"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
-msgid "Action"
-msgstr "Azione"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
+#, fuzzy
+msgid "Printer inventory extension"
+msgstr "Elimina foto"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
+#, fuzzy
+msgid "Supports serial interface"
+msgstr "Mostra dispositiva di rete"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
+#, fuzzy
+msgid "Supports parallel interface"
+msgstr "Mostra dispositiva di rete"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
+#, fuzzy
+msgid "Supports usb interface"
+msgstr "Mostra dispositiva di rete"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
+#: admin/systems/services/glpi/class_glpiAccount.inc:805
+msgid "Location"
+msgstr "Località"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
+#, fuzzy
+msgid "Cartridge settings"
+msgstr "Opzioni di posta dell'identità"
 
-#: admin/systems/services/glpi/glpi_edit_type.tpl:1
+#: admin/systems/services/glpi/glpi.tpl:9
 #, fuzzy
-msgid "Manage System-types"
+msgid "System type"
 msgstr "Sistemi"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
-msgid "Can't delete this entry, it is still in use."
-msgstr ""
+#: admin/systems/services/glpi/glpi.tpl:23
+#: admin/systems/services/glpi/class_glpiAccount.inc:804
+#, fuzzy
+msgid "Operating system"
+msgstr "Rimuovi"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
+#: admin/systems/services/glpi/glpi.tpl:96
 #, fuzzy
-msgid "The selected name is already in use."
-msgstr "L'indirizzo principale inserito è già in uso."
+msgid "Installed devices"
+msgstr "Dispositivi del client"
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
+#: admin/systems/services/glpi/glpi.tpl:112
 #, fuzzy
-msgid "Reference"
-msgstr "Riferimenti"
+msgid "Trading"
+msgstr "Ricerca"
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
-msgid "Choose"
-msgstr "Scegli"
+#: admin/systems/services/glpi/glpi.tpl:113
+#, fuzzy
+msgid "Software"
+msgstr "Stato"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
+#: admin/systems/services/glpi/glpi.tpl:114
 #, fuzzy
-msgid "Attachment"
-msgstr "Argomenti"
+msgid "Contracts"
+msgstr "Contatto"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
-msgid "File"
+#: admin/systems/services/glpi/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
-msgid "Upload"
-msgstr ""
+#: admin/systems/services/glpi/remove_glpi.tpl:2
+msgid "Warning"
+msgstr "Attenzione"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
-msgid "Status"
-msgstr "Stato"
+#: admin/systems/services/glpi/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
-#, fuzzy
-msgid "Filename"
-msgstr "Cognome"
+#: admin/systems/services/glpi/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
+#: admin/systems/services/glpi/glpiManufacturer.tpl:1
 #, fuzzy
-msgid "Mime-type"
-msgstr "Tipo"
+msgid "Manage manufacturers"
+msgstr "Modifica contatto"
 
 #: admin/systems/services/glpi/class_glpiAccount.inc:198
 #: admin/systems/services/glpi/class_glpiAccount.inc:204
@@ -1025,55 +1181,6 @@ msgstr ""
 msgid "Peripheral devices"
 msgstr "Dispositivi del client"
 
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
-#, fuzzy
-msgid "List of attachments"
-msgstr "Lista dei dipartimenti"
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
-msgstr ""
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
-#, fuzzy
-msgid "Display attachments matching"
-msgstr "Mosra gruppi corrispondenti a"
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
-#, fuzzy
-msgid "Regular expression for matching attachment names"
-msgstr "Espressioni regolare per selezionare il nome del gruppo"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:9
-#, fuzzy
-msgid "Printer type"
-msgstr "Nome della stampante"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:39
-#, fuzzy
-msgid "Supported interfaces"
-msgstr "Mostra dispositiva di rete"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:48
-#, fuzzy
-msgid "Serial"
-msgstr "Terminali"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:58
-msgid "Parallel"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:68
-msgid "USB"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:139
-#, fuzzy
-msgid "Installed cartridges"
-msgstr "Dispositivi del client"
-
 #: admin/systems/services/glpi/class_glpiSelectUser.inc:108
 msgid "Users"
 msgstr "Utenti"
@@ -1128,132 +1235,25 @@ msgstr "Base"
 msgid "Submit department"
 msgstr "Imposta dipartimento"
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
 #, fuzzy
-msgid "attachment"
-msgstr "Argomenti"
+msgid "List of devices"
+msgstr "Lista degli utenti"
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
-#, php-format
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
 msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
-#, fuzzy
-msgid "There is no valid file uploaded."
-msgstr "Prego inserire un numero di telefono valido!"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
-msgid "Upload wasn't successfull."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
-#, php-format
-msgid "Missing directory '%s/glpi/' to store glpi uploads."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
-#, fuzzy
-msgid "There is already a file with the same name uploaded."
-msgstr "Prego inserire un numero di telefono valido!"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
-#, fuzzy, php-format
-msgid "Can't create file '%s'."
-msgstr "Rimuovi"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
-msgid "File is available."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
-msgid "File is not readable, possibly the file is missing."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
-msgid "Currently no file uploaded."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
-#, fuzzy
-msgid "Mime"
-msgstr "Cellulare"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
-msgid "This table displays all available attachments."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
-#, fuzzy
-msgid "empty"
-msgstr "Riprova"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
-#, fuzzy
-msgid "Create new attachment"
-msgstr "Lista dei dipartimenti"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
-#, fuzzy
-msgid "New Attachment"
-msgstr "Argomenti"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
-#, fuzzy
-msgid "This name is already in use."
-msgstr "L'indirizzo principale inserito è già in uso."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
-#, fuzzy
-msgid "Please specify a valid name for this attachment."
-msgstr "Specificare una dimenzione valida per le mail da rigettare."
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:32
-#: admin/systems/services/glpi/class_goGlpiServer.inc:87
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-#, fuzzy
-msgid "Inventory database"
-msgstr "Database"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:58
-#, fuzzy
-msgid "Inventory database service"
-msgstr "Database"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:67
-#, fuzzy
-msgid "The attribute user is empty or contains invalid characters."
-msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:70
-#, fuzzy
-msgid "The attribute database is empty or contains invalid characters."
-msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-msgid "Services"
-msgstr "Servizi"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:96
-#, fuzzy
-msgid "Start"
-msgstr "Avvio"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:97
-msgid "Stop"
+"This dialog allows you to attach a device to your currently edited computer."
 msgstr ""
 
-#: admin/systems/services/glpi/class_goGlpiServer.inc:98
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
 #, fuzzy
-msgid "Restart"
-msgstr "Riprova"
+msgid "Display devices matching"
+msgstr "Mostra gli indirizzi che corrispondono"
 
-#: admin/systems/services/glpi/class_goGlpiServer.inc:100
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
 #, fuzzy
-msgid "Admin"
-msgstr "DN dell'amministratore"
+msgid "Regular expression for matching device names"
+msgstr "Espressioni regolare per selezionare il nome del gruppo"
 
 #~ msgid "Add"
 #~ msgstr "Aggiungi"
index d0e63e30b7a7bfb69db24ec299cf13bb1e0de529..2119d253e58ef7c4d7eae187414567c09625fa89 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-14 13:40+0100\n"
+"POT-Creation-Date: 2008-04-03 16:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,66 +16,167 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:6
-msgid "List of users"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
+msgid "Add/Edit manufacturer"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:20
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
-#: admin/systems/services/glpi/glpiPrinter.tpl:127
-msgid "Information"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
+#: admin/systems/services/glpi/glpi_devices.tpl:10
+#: admin/systems/services/glpi/glpi_devices.tpl:105
+#: admin/systems/services/glpi/glpi_devices.tpl:146
+#: admin/systems/services/glpi/glpi_devices.tpl:201
+#: admin/systems/services/glpi/glpi_devices.tpl:257
+#: admin/systems/services/glpi/glpi_devices.tpl:315
+#: admin/systems/services/glpi/glpi_devices.tpl:379
+#: admin/systems/services/glpi/glpi_devices.tpl:451
+#: admin/systems/services/glpi/glpi_devices.tpl:515
+#: admin/systems/services/glpi/glpi_devices.tpl:562
+#: admin/systems/services/glpi/glpi_devices.tpl:615
+#: admin/systems/services/glpi/glpi_devices.tpl:669
+#: admin/systems/services/glpi/glpi_devices.tpl:715
+msgid "Name"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:23
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
+msgid "Website"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
+msgid "Address"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
+msgid "Phone number"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
+msgid "Fax"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
+#: admin/systems/services/glpi/glpi_devices.tpl:17
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
+msgid "Comments"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
+#: admin/systems/services/glpi/glpi_edit_type.tpl:15
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
+#: admin/systems/services/glpi/glpi_edit_os.tpl:15
+#: admin/systems/services/glpi/glpiManufacturer.tpl:13
+msgid "Close"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
+msgid "attachment"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
+#, php-format
 msgid ""
-"This dialog allows you to select a user as technical responsible person."
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:27
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
-msgid "Filters"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
+msgid "There is no valid file uploaded."
 msgstr ""
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:35
-msgid "Display users matching"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
+msgid "Upload wasn't successfull."
 msgstr ""
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:37
-msgid "Regular expression for matching user names"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
+#, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:6
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
+msgid "There is already a file with the same name uploaded."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
+#, php-format
+msgid "Can't create file '%s'."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
+msgid "File is available."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
+msgid "File is not readable, possibly the file is missing."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
+msgid "Currently no file uploaded."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
+msgid "Mime"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
+msgid "Actions"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
+msgid "This table displays all available attachments."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
+msgid "empty"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
+msgid "Create new attachment"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
+msgid "New Attachment"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
+msgid "This name is already in use."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
+msgid "Please specify a valid name for this attachment."
+msgstr ""
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:6
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:4
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:34
-#: admin/systems/services/glpi/glpiPrinter.tpl:6
+#: admin/systems/services/glpi/glpi.tpl:6
 msgid "Generic"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:9
-msgid "System type"
+#: admin/systems/services/glpi/glpiPrinter.tpl:9
+msgid "Printer type"
 msgstr ""
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:18
+#: admin/systems/services/glpi/glpiPrinter.tpl:32
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
 #: admin/systems/services/glpi/glpi.tpl:18
 #: admin/systems/services/glpi/glpi.tpl:32
 #: admin/systems/services/glpi/glpi.tpl:46
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
-#: admin/systems/services/glpi/glpiPrinter.tpl:18
-#: admin/systems/services/glpi/glpiPrinter.tpl:32
 msgid "edit"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:23
-#: admin/systems/services/glpi/class_glpiAccount.inc:804
-msgid "Operating system"
-msgstr ""
-
-#: admin/systems/services/glpi/glpi.tpl:37
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpiPrinter.tpl:23
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
 #: admin/systems/services/glpi/glpi_devices.tpl:24
 #: admin/systems/services/glpi/glpi_devices.tpl:123
 #: admin/systems/services/glpi/glpi_devices.tpl:164
@@ -89,44 +190,125 @@ msgstr ""
 #: admin/systems/services/glpi/glpi_devices.tpl:633
 #: admin/systems/services/glpi/glpi_devices.tpl:687
 #: admin/systems/services/glpi/glpi_devices.tpl:733
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpi.tpl:37
 #: admin/systems/services/glpi/class_glpiAccount.inc:809
-#: admin/systems/services/glpi/glpiPrinter.tpl:23
 msgid "Manufacturer"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:52
+#: admin/systems/services/glpi/glpiPrinter.tpl:39
+msgid "Supported interfaces"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:48
+msgid "Serial"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:58
+msgid "Parallel"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:68
+msgid "USB"
+msgstr ""
+
 #: admin/systems/services/glpi/glpiPrinter.tpl:80
+#: admin/systems/services/glpi/glpi.tpl:52
 msgid "Contacts"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:56
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
-#: admin/systems/services/glpi/class_glpiAccount.inc:806
-#: admin/systems/services/glpi/glpiPrinter.tpl:94
-msgid "Contact person"
+#: admin/systems/services/glpi/glpiPrinter.tpl:83
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
+#: admin/systems/services/glpi/glpi.tpl:66
+#: admin/systems/services/glpi/class_glpiAccount.inc:802
+msgid "Technical responsible"
 msgstr ""
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:88
+#: admin/systems/services/glpi/glpiPrinter.tpl:99
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
 #: admin/systems/services/glpi/glpi.tpl:61
 #: admin/systems/services/glpi/glpi.tpl:71
 #: admin/systems/services/glpi/glpi.tpl:106
 #: admin/systems/services/glpi/glpiManufacturer.tpl:7
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
-#: admin/systems/services/glpi/glpiPrinter.tpl:88
-#: admin/systems/services/glpi/glpiPrinter.tpl:99
 msgid "Edit"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:66
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
-#: admin/systems/services/glpi/class_glpiAccount.inc:802
-#: admin/systems/services/glpi/glpiPrinter.tpl:83
-msgid "Technical responsible"
+#: admin/systems/services/glpi/glpiPrinter.tpl:94
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
+#: admin/systems/services/glpi/glpi.tpl:56
+#: admin/systems/services/glpi/class_glpiAccount.inc:806
+msgid "Contact person"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:79
+#: admin/systems/services/glpi/glpiPrinter.tpl:107
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
+#: admin/systems/services/glpi/glpi.tpl:117
+#: admin/systems/services/glpi/class_glpiAccount.inc:810
+msgid "Attachments"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:127
+#: admin/systems/services/glpi/glpiSelectUser.tpl:20
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
+msgid "Information"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:139
+msgid "Installed cartridges"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:152
+#: admin/systems/services/glpi/glpiManufacturer.tpl:8
+msgid "Remove"
+msgstr ""
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:1
+msgid "Manage System-types"
+msgstr ""
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:9
+#: admin/systems/services/glpi/glpi_edit_type.tpl:28
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
+#: admin/systems/services/glpi/glpi_edit_os.tpl:9
+#: admin/systems/services/glpi/glpi_edit_os.tpl:28
+msgid "Rename"
+msgstr ""
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:24
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
+#: admin/systems/services/glpi/glpi_edit_os.tpl:24
+msgid "Please enter a new name"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
+msgid "Can't delete this entry, it is still in use."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
+#: admin/systems/services/glpi/class_glpiAccount.inc:656
+#: admin/systems/services/glpi/class_glpiAccount.inc:671
+msgid "N/A"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
+msgid "The selected name is already in use."
+msgstr ""
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
 #: admin/systems/services/glpi/glpi_devices.tpl:112
 #: admin/systems/services/glpi/glpi_devices.tpl:153
 #: admin/systems/services/glpi/glpi_devices.tpl:208
@@ -139,194 +321,150 @@ msgstr ""
 #: admin/systems/services/glpi/glpi_devices.tpl:622
 #: admin/systems/services/glpi/glpi_devices.tpl:676
 #: admin/systems/services/glpi/glpi_devices.tpl:722
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
+#: admin/systems/services/glpi/glpi.tpl:79
 #: admin/systems/services/glpi/class_glpiAccount.inc:803
 msgid "Comment"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:96
-msgid "Installed devices"
-msgstr ""
-
-#: admin/systems/services/glpi/glpi.tpl:112
-msgid "Trading"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
+msgid "File"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:113
-msgid "Software"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
+msgid "Upload"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:114
-msgid "Contracts"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
+msgid "Status"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:117
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
-#: admin/systems/services/glpi/class_glpiAccount.inc:810
-#: admin/systems/services/glpi/glpiPrinter.tpl:107
-msgid "Attachments"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
+msgid "Filename"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
-#: admin/systems/services/glpi/class_glpiAccount.inc:146
-msgid "There is no server with valid glpi database service."
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
-#: admin/systems/services/glpi/class_glpiAccount.inc:156
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
+msgid "cartridge"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
-#: admin/systems/services/glpi/class_glpiAccount.inc:166
-msgid "Can't connect to glpi database, check configuration twice."
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
+#, php-format
+msgid ""
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
-#: admin/systems/services/glpi/class_glpiAccount.inc:181
-msgid "Download of attachment failed. Attachment was not found on server."
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
+msgid "Cartridges"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
-#: admin/systems/services/glpi/class_glpiAccount.inc:184
-msgid "Download of attachment failed. Not a valid attachment id."
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
+msgid "Action"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
-#: admin/systems/services/glpi/class_glpiAccount.inc:593
-msgid "Remove inventory"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
+msgid "Delete"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
+msgid "New monitor"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
-#: admin/systems/services/glpi/class_glpiAccount.inc:596
-msgid "Add inventory"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
+msgid "M"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
+#, php-format
 msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
-#, php-format
-msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
+msgid "Please specify a name."
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
+msgid "Specified name is already in use, please choose another one."
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
-#: admin/systems/services/glpi/class_glpiAccount.inc:656
-#: admin/systems/services/glpi/class_glpiAccount.inc:671
-msgid "N/A"
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
-msgid "since"
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
+#: admin/systems/services/glpi/glpi_devices.tpl:427
+#: admin/systems/services/glpi/glpi_devices.tpl:492
+#: admin/systems/services/glpi/glpi_devices.tpl:542
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
+#: admin/systems/services/glpi/class_glpiAccount.inc:808
+msgid "Type"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
-#: admin/systems/services/glpi/class_glpiAccount.inc:793
-msgid "Glpi"
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
+msgid "Choose"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
-msgid "Printer inventory extension"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:32
+#: admin/systems/services/glpi/class_goGlpiServer.inc:87
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
+msgid "Inventory database"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
-msgid "Supports serial interface"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:58
+msgid "Inventory database service"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
-msgid "Supports parallel interface"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:67
+msgid "The attribute user is empty or contains invalid characters."
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
-msgid "Supports usb interface"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:70
+msgid "The attribute database is empty or contains invalid characters."
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
-#: admin/systems/services/glpi/glpi_devices.tpl:17
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
-msgid "Comments"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
+msgid "Services"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
-#: admin/systems/services/glpi/class_glpiAccount.inc:805
-msgid "Location"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:96
+msgid "Start"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
-#: admin/systems/services/glpi/glpi_devices.tpl:427
-#: admin/systems/services/glpi/glpi_devices.tpl:492
-#: admin/systems/services/glpi/glpi_devices.tpl:542
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
-#: admin/systems/services/glpi/class_glpiAccount.inc:808
-msgid "Type"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:97
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
-msgid "Cartridge settings"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:98
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/services/glpi/remove_glpi.tpl:2
-msgid "Warning"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:100
+msgid "Admin"
 msgstr ""
 
-#: admin/systems/services/glpi/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
+#: admin/systems/services/glpi/class_goGlpiServer.inc:101
+#: admin/systems/services/glpi/goGlpiServer.tpl:20
+msgid "Database"
 msgstr ""
 
-#: admin/systems/services/glpi/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: admin/systems/services/glpi/class_goGlpiServer.inc:102
+#: admin/systems/services/glpi/goGlpiServer.tpl:12
+msgid "Password"
 msgstr ""
 
 #: admin/systems/services/glpi/glpi_devices.tpl:2
 msgid "Add/Edit monitor"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi_devices.tpl:10
-#: admin/systems/services/glpi/glpi_devices.tpl:105
-#: admin/systems/services/glpi/glpi_devices.tpl:146
-#: admin/systems/services/glpi/glpi_devices.tpl:201
-#: admin/systems/services/glpi/glpi_devices.tpl:257
-#: admin/systems/services/glpi/glpi_devices.tpl:315
-#: admin/systems/services/glpi/glpi_devices.tpl:379
-#: admin/systems/services/glpi/glpi_devices.tpl:451
-#: admin/systems/services/glpi/glpi_devices.tpl:515
-#: admin/systems/services/glpi/glpi_devices.tpl:562
-#: admin/systems/services/glpi/glpi_devices.tpl:615
-#: admin/systems/services/glpi/glpi_devices.tpl:669
-#: admin/systems/services/glpi/glpi_devices.tpl:715
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
-msgid "Name"
-msgstr ""
-
 #: admin/systems/services/glpi/glpi_devices.tpl:33
 msgid "Monitor size"
 msgstr ""
@@ -495,65 +633,6 @@ msgstr ""
 msgid "format"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
-#: admin/systems/services/glpi/glpi_edit_os.tpl:9
-#: admin/systems/services/glpi/glpi_edit_os.tpl:28
-#: admin/systems/services/glpi/glpi_edit_type.tpl:9
-#: admin/systems/services/glpi/glpi_edit_type.tpl:28
-msgid "Rename"
-msgstr ""
-
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
-#: admin/systems/services/glpi/glpiManufacturer.tpl:13
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
-#: admin/systems/services/glpi/glpi_edit_os.tpl:15
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
-#: admin/systems/services/glpi/glpi_edit_type.tpl:15
-msgid "Close"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:1
-msgid "Manage manufacturers"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:8
-#: admin/systems/services/glpi/glpiPrinter.tpl:152
-msgid "Remove"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
-msgid "List of devices"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
-msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
-msgstr ""
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
-msgid "Display devices matching"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
-msgid "Regular expression for matching device names"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
-msgid "Use"
-msgstr ""
-
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
-#: admin/systems/services/glpi/glpi_edit_os.tpl:24
-#: admin/systems/services/glpi/glpi_edit_type.tpl:24
-msgid "Please enter a new name"
-msgstr ""
-
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:88
 #, php-format
 msgid "Internal Error can't create device of type '%s'"
@@ -578,26 +657,6 @@ msgstr ""
 msgid "devices"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
-msgid "Actions"
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
-msgid "Delete"
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-msgid "New monitor"
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-msgid "M"
-msgstr ""
-
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:223
 msgid "New mainbord"
 msgstr ""
@@ -715,48 +774,75 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:6
+msgid "List of users"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
-msgid "Add/Edit manufacturer"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
 msgstr ""
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
-msgid "Website"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:27
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
+msgid "Filters"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
-msgid "Address"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:35
+msgid "Display users matching"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
-msgid "Phone number"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:37
+msgid "Regular expression for matching user names"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
-msgid "Fax"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
-msgid "Email"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
+msgid ""
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
-#, php-format
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
+msgid "Display attachments matching"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
+msgid "Regular expression for matching attachment names"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
+msgid "Use"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
+msgstr ""
+
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:23
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"This dialog allows you to create new types of cartridges, and select one or "
+"more types for your printer. Cartridge types depends on the printer type you "
+"have selected. For each selected cartridge type there will be a new "
+"cartridge created, this allows you to select the same cartridge type for "
+"more then one printer."
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
-msgid "Please specify a name."
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:35
+msgid "Display cartridge types matching"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
-msgid "Specified name is already in use, please choose another one."
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:37
+msgid "Regular expression for matching cartridge types"
 msgstr ""
 
 #: admin/systems/services/glpi/goGlpiServer.tpl:1
@@ -767,98 +853,148 @@ msgstr ""
 msgid "Logging DB user"
 msgstr ""
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:12
-#: admin/systems/services/glpi/class_goGlpiServer.inc:102
-msgid "Password"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
+#: admin/systems/services/glpi/class_glpiAccount.inc:146
+msgid "There is no server with valid glpi database service."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
+#: admin/systems/services/glpi/class_glpiAccount.inc:156
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
+#: admin/systems/services/glpi/class_glpiAccount.inc:166
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
+#: admin/systems/services/glpi/class_glpiAccount.inc:181
+msgid "Download of attachment failed. Attachment was not found on server."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
+#: admin/systems/services/glpi/class_glpiAccount.inc:184
+msgid "Download of attachment failed. Not a valid attachment id."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
+#: admin/systems/services/glpi/class_glpiAccount.inc:593
+msgid "Remove inventory"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
+#: admin/systems/services/glpi/class_glpiAccount.inc:596
+msgid "Add inventory"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
+#, php-format
+msgid ""
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
 msgstr ""
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:20
-#: admin/systems/services/glpi/class_goGlpiServer.inc:101
-msgid "Database"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
 msgstr ""
 
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:6
-msgid "List of available cartridge type for this type of printer"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
+msgid "since"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:23
-msgid ""
-"This dialog allows you to create new types of cartridges, and select one or "
-"more types for your printer. Cartridge types depends on the printer type you "
-"have selected. For each selected cartridge type there will be a new "
-"cartridge created, this allows you to select the same cartridge type for "
-"more then one printer."
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
+#: admin/systems/services/glpi/class_glpiAccount.inc:793
+msgid "Glpi"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:35
-msgid "Display cartridge types matching"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
+msgid "Printer inventory extension"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:37
-msgid "Regular expression for matching cartridge types"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
+msgid "Supports serial interface"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
-msgid "cartridge"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
+msgid "Supports parallel interface"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
-#, php-format
-msgid ""
-"You can't delete this cartridge type, it is still in use by this printer(s) "
-"'%s'."
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
+msgid "Supports usb interface"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
-msgid "Cartridges"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
+#: admin/systems/services/glpi/class_glpiAccount.inc:805
+msgid "Location"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
-msgid "Action"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
+msgid "Cartridge settings"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi_edit_type.tpl:1
-msgid "Manage System-types"
+#: admin/systems/services/glpi/glpi.tpl:9
+msgid "System type"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
-msgid "Can't delete this entry, it is still in use."
+#: admin/systems/services/glpi/glpi.tpl:23
+#: admin/systems/services/glpi/class_glpiAccount.inc:804
+msgid "Operating system"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
-msgid "The selected name is already in use."
+#: admin/systems/services/glpi/glpi.tpl:96
+msgid "Installed devices"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
-msgid "Reference"
+#: admin/systems/services/glpi/glpi.tpl:112
+msgid "Trading"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
-msgid "Choose"
+#: admin/systems/services/glpi/glpi.tpl:113
+msgid "Software"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
-msgid "Attachment"
+#: admin/systems/services/glpi/glpi.tpl:114
+msgid "Contracts"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
-msgid "File"
+#: admin/systems/services/glpi/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
-msgid "Upload"
+#: admin/systems/services/glpi/remove_glpi.tpl:2
+msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
-msgid "Status"
+#: admin/systems/services/glpi/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
-msgid "Filename"
+#: admin/systems/services/glpi/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
-msgid "Mime-type"
+#: admin/systems/services/glpi/glpiManufacturer.tpl:1
+msgid "Manage manufacturers"
 msgstr ""
 
 #: admin/systems/services/glpi/class_glpiAccount.inc:198
@@ -932,48 +1068,6 @@ msgstr ""
 msgid "Peripheral devices"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
-msgid "List of attachments"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
-msgstr ""
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
-msgid "Display attachments matching"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
-msgid "Regular expression for matching attachment names"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:9
-msgid "Printer type"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:39
-msgid "Supported interfaces"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:48
-msgid "Serial"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:58
-msgid "Parallel"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:68
-msgid "USB"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:139
-msgid "Installed cartridges"
-msgstr ""
-
 #: admin/systems/services/glpi/class_glpiSelectUser.inc:108
 msgid "Users"
 msgstr ""
@@ -1027,113 +1121,19 @@ msgstr ""
 msgid "Submit department"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
-msgid "attachment"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
+msgid "List of devices"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
-#, php-format
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
 msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
-msgid "There is no valid file uploaded."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
-msgid "Upload wasn't successfull."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
-#, php-format
-msgid "Missing directory '%s/glpi/' to store glpi uploads."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
-msgid "There is already a file with the same name uploaded."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
-#, php-format
-msgid "Can't create file '%s'."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
-msgid "File is available."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
-msgid "File is not readable, possibly the file is missing."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
-msgid "Currently no file uploaded."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
-msgid "Mime"
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
-msgid "This table displays all available attachments."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
-msgid "empty"
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
-msgid "Create new attachment"
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
-msgid "New Attachment"
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
-msgid "This name is already in use."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
-msgid "Please specify a valid name for this attachment."
-msgstr ""
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:32
-#: admin/systems/services/glpi/class_goGlpiServer.inc:87
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-msgid "Inventory database"
-msgstr ""
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:58
-msgid "Inventory database service"
-msgstr ""
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:67
-msgid "The attribute user is empty or contains invalid characters."
-msgstr ""
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:70
-msgid "The attribute database is empty or contains invalid characters."
-msgstr ""
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-msgid "Services"
-msgstr ""
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:96
-msgid "Start"
-msgstr ""
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:97
-msgid "Stop"
+"This dialog allows you to attach a device to your currently edited computer."
 msgstr ""
 
-#: admin/systems/services/glpi/class_goGlpiServer.inc:98
-msgid "Restart"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
+msgid "Display devices matching"
 msgstr ""
 
-#: admin/systems/services/glpi/class_goGlpiServer.inc:100
-msgid "Admin"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
+msgid "Regular expression for matching device names"
 msgstr ""
index 9eb19a767be2d2219849f5f8c88817ac70781f2f..46518a75e087f0371b616ecca22d4a21c8e94901 100644 (file)
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-14 13:40+0100\n"
+"POT-Creation-Date: 2008-04-03 16:04+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -19,68 +19,171 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:6
-msgid "List of users"
-msgstr "Lijst met gebruikers"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
+msgid "Add/Edit manufacturer"
+msgstr "Fabrikant toevoegen/bewerken"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:20
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
-#: admin/systems/services/glpi/glpiPrinter.tpl:127
-msgid "Information"
-msgstr "Informatie"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
+#: admin/systems/services/glpi/glpi_devices.tpl:10
+#: admin/systems/services/glpi/glpi_devices.tpl:105
+#: admin/systems/services/glpi/glpi_devices.tpl:146
+#: admin/systems/services/glpi/glpi_devices.tpl:201
+#: admin/systems/services/glpi/glpi_devices.tpl:257
+#: admin/systems/services/glpi/glpi_devices.tpl:315
+#: admin/systems/services/glpi/glpi_devices.tpl:379
+#: admin/systems/services/glpi/glpi_devices.tpl:451
+#: admin/systems/services/glpi/glpi_devices.tpl:515
+#: admin/systems/services/glpi/glpi_devices.tpl:562
+#: admin/systems/services/glpi/glpi_devices.tpl:615
+#: admin/systems/services/glpi/glpi_devices.tpl:669
+#: admin/systems/services/glpi/glpi_devices.tpl:715
+msgid "Name"
+msgstr "Naam"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:23
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
+msgid "Website"
+msgstr "Website"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
+msgid "Address"
+msgstr "Adres"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
+msgid "Phone number"
+msgstr "Telefoonnummer"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
+msgid "Fax"
+msgstr "Fax"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr "E-mail"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
+#: admin/systems/services/glpi/glpi_devices.tpl:17
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
+msgid "Comments"
+msgstr "Opmerkingen"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
+#: admin/systems/services/glpi/glpi_edit_type.tpl:15
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
+#: admin/systems/services/glpi/glpi_edit_os.tpl:15
+#: admin/systems/services/glpi/glpiManufacturer.tpl:13
+msgid "Close"
+msgstr "Sluiten"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
+#, fuzzy
+msgid "attachment"
+msgstr "Bijlage"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
+#, php-format
 msgid ""
-"This dialog allows you to select a user as technical responsible person."
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
-"Deze dialoog stelt u in staat om een gebruiker als technisch "
-"verantwoordelijk persoon aan te wijzen."
+"U kunt deze bijlage niet verwijderen, aangezien deze nog steeds in gebruik "
+"is door deze systemen: '%s'"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:27
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
-msgid "Filters"
-msgstr "Filters"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
+msgid "There is no valid file uploaded."
+msgstr "Er is geen geldig bestand ge-upload."
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:35
-msgid "Display users matching"
-msgstr "Toon overeenkomende gebruikers"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
+msgid "Upload wasn't successfull."
+msgstr "Upload was niet succesvol"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:37
-msgid "Regular expression for matching user names"
-msgstr "Reguliere expressie voor overeenkomende gebruikersnamen"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
+#, fuzzy, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
+msgstr ""
+"De directory '/etc/gosa/glpi/', om GLPI bestanden in te bewaren, ontbreekt. "
 
-#: admin/systems/services/glpi/glpi.tpl:6
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
+msgid "There is already a file with the same name uploaded."
+msgstr "Er bestaat al een bestand met dezelfde naam."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
+#, php-format
+msgid "Can't create file '%s'."
+msgstr "Kan bestand '%s' niet aanmaken."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
+msgid "File is available."
+msgstr "Bestand is beschikbaar"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
+msgid "File is not readable, possibly the file is missing."
+msgstr "Bestand is niet leesbaar. Het is mogelijk dat het bestand ontbreekt."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
+msgid "Currently no file uploaded."
+msgstr "Er is momenteel geen bestand ge-upload."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
+msgid "Mime"
+msgstr "MIME"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
+msgid "Actions"
+msgstr "Acties"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
+msgid "This table displays all available attachments."
+msgstr "Deze tabel geeft alle beschikbaare bijlages weer"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
+msgid "empty"
+msgstr "leeg"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
+msgid "Create new attachment"
+msgstr "Nieuwe bijlage aanmaken"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
+msgid "New Attachment"
+msgstr "Nieuwe bijlage"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
+msgid "This name is already in use."
+msgstr "De opgegeven naam wordt al gebruikt."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
+msgid "Please specify a valid name for this attachment."
+msgstr "Geef a.u.b. een geldige naam op voor deze bijlage."
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:6
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:4
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:34
-#: admin/systems/services/glpi/glpiPrinter.tpl:6
+#: admin/systems/services/glpi/glpi.tpl:6
 msgid "Generic"
 msgstr "Algemeen"
 
-#: admin/systems/services/glpi/glpi.tpl:9
-msgid "System type"
-msgstr "Systeemtype"
+#: admin/systems/services/glpi/glpiPrinter.tpl:9
+msgid "Printer type"
+msgstr "Printertype"
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:18
+#: admin/systems/services/glpi/glpiPrinter.tpl:32
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
 #: admin/systems/services/glpi/glpi.tpl:18
 #: admin/systems/services/glpi/glpi.tpl:32
 #: admin/systems/services/glpi/glpi.tpl:46
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
-#: admin/systems/services/glpi/glpiPrinter.tpl:18
-#: admin/systems/services/glpi/glpiPrinter.tpl:32
 msgid "edit"
 msgstr "Bewerk"
 
-#: admin/systems/services/glpi/glpi.tpl:23
-#: admin/systems/services/glpi/class_glpiAccount.inc:804
-msgid "Operating system"
-msgstr "Besturingssysteem"
-
-#: admin/systems/services/glpi/glpi.tpl:37
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpiPrinter.tpl:23
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
 #: admin/systems/services/glpi/glpi_devices.tpl:24
 #: admin/systems/services/glpi/glpi_devices.tpl:123
 #: admin/systems/services/glpi/glpi_devices.tpl:164
@@ -94,44 +197,125 @@ msgstr "Besturingssysteem"
 #: admin/systems/services/glpi/glpi_devices.tpl:633
 #: admin/systems/services/glpi/glpi_devices.tpl:687
 #: admin/systems/services/glpi/glpi_devices.tpl:733
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpi.tpl:37
 #: admin/systems/services/glpi/class_glpiAccount.inc:809
-#: admin/systems/services/glpi/glpiPrinter.tpl:23
 msgid "Manufacturer"
 msgstr "Fabricant"
 
-#: admin/systems/services/glpi/glpi.tpl:52
+#: admin/systems/services/glpi/glpiPrinter.tpl:39
+msgid "Supported interfaces"
+msgstr "Ondersteunde interfaces"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:48
+msgid "Serial"
+msgstr "Serieel"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:58
+msgid "Parallel"
+msgstr "Parallel"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:68
+msgid "USB"
+msgstr "USB"
+
 #: admin/systems/services/glpi/glpiPrinter.tpl:80
+#: admin/systems/services/glpi/glpi.tpl:52
 msgid "Contacts"
 msgstr "Contacten"
 
-#: admin/systems/services/glpi/glpi.tpl:56
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
-#: admin/systems/services/glpi/class_glpiAccount.inc:806
-#: admin/systems/services/glpi/glpiPrinter.tpl:94
-msgid "Contact person"
-msgstr "Contactpersoon"
+#: admin/systems/services/glpi/glpiPrinter.tpl:83
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
+#: admin/systems/services/glpi/glpi.tpl:66
+#: admin/systems/services/glpi/class_glpiAccount.inc:802
+msgid "Technical responsible"
+msgstr "Technisch verantwoordelijke"
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:88
+#: admin/systems/services/glpi/glpiPrinter.tpl:99
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
 #: admin/systems/services/glpi/glpi.tpl:61
 #: admin/systems/services/glpi/glpi.tpl:71
 #: admin/systems/services/glpi/glpi.tpl:106
 #: admin/systems/services/glpi/glpiManufacturer.tpl:7
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
-#: admin/systems/services/glpi/glpiPrinter.tpl:88
-#: admin/systems/services/glpi/glpiPrinter.tpl:99
 msgid "Edit"
 msgstr "Bewerken"
 
-#: admin/systems/services/glpi/glpi.tpl:66
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
-#: admin/systems/services/glpi/class_glpiAccount.inc:802
-#: admin/systems/services/glpi/glpiPrinter.tpl:83
-msgid "Technical responsible"
-msgstr "Technisch verantwoordelijke"
+#: admin/systems/services/glpi/glpiPrinter.tpl:94
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
+#: admin/systems/services/glpi/glpi.tpl:56
+#: admin/systems/services/glpi/class_glpiAccount.inc:806
+msgid "Contact person"
+msgstr "Contactpersoon"
 
-#: admin/systems/services/glpi/glpi.tpl:79
+#: admin/systems/services/glpi/glpiPrinter.tpl:107
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
+#: admin/systems/services/glpi/glpi.tpl:117
+#: admin/systems/services/glpi/class_glpiAccount.inc:810
+msgid "Attachments"
+msgstr "Bijlagen"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:127
+#: admin/systems/services/glpi/glpiSelectUser.tpl:20
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
+msgid "Information"
+msgstr "Informatie"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:139
+msgid "Installed cartridges"
+msgstr "Geinstalleerde cartridges"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:152
+#: admin/systems/services/glpi/glpiManufacturer.tpl:8
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:1
+msgid "Manage System-types"
+msgstr "Systeemtypes beheren"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:9
+#: admin/systems/services/glpi/glpi_edit_type.tpl:28
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
+#: admin/systems/services/glpi/glpi_edit_os.tpl:9
+#: admin/systems/services/glpi/glpi_edit_os.tpl:28
+msgid "Rename"
+msgstr "Hernoemen"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:24
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
+#: admin/systems/services/glpi/glpi_edit_os.tpl:24
+msgid "Please enter a new name"
+msgstr "Geef a.u.b. een nieuwe naam op"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
+msgid "Can't delete this entry, it is still in use."
+msgstr "Kan dit object niet verwijderen, aangezien deze nog in gebruik is."
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
+#: admin/systems/services/glpi/class_glpiAccount.inc:656
+#: admin/systems/services/glpi/class_glpiAccount.inc:671
+msgid "N/A"
+msgstr "Niet beschikbaar"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
+msgid "The selected name is already in use."
+msgstr "De opgegeven naam wordt al gebruikt."
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
+msgstr "Bijlage"
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
 #: admin/systems/services/glpi/glpi_devices.tpl:112
 #: admin/systems/services/glpi/glpi_devices.tpl:153
 #: admin/systems/services/glpi/glpi_devices.tpl:208
@@ -144,216 +328,162 @@ msgstr "Technisch verantwoordelijke"
 #: admin/systems/services/glpi/glpi_devices.tpl:622
 #: admin/systems/services/glpi/glpi_devices.tpl:676
 #: admin/systems/services/glpi/glpi_devices.tpl:722
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
+#: admin/systems/services/glpi/glpi.tpl:79
 #: admin/systems/services/glpi/class_glpiAccount.inc:803
 msgid "Comment"
 msgstr "Opmerking"
 
-#: admin/systems/services/glpi/glpi.tpl:96
-msgid "Installed devices"
-msgstr "Geinstalleerde apparaten"
-
-#: admin/systems/services/glpi/glpi.tpl:112
-msgid "Trading"
-msgstr "Uit-/Omwisseling"
-
-#: admin/systems/services/glpi/glpi.tpl:113
-msgid "Software"
-msgstr "Software"
-
-#: admin/systems/services/glpi/glpi.tpl:114
-msgid "Contracts"
-msgstr "Contracten"
-
-#: admin/systems/services/glpi/glpi.tpl:117
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
-#: admin/systems/services/glpi/class_glpiAccount.inc:810
-#: admin/systems/services/glpi/glpiPrinter.tpl:107
-msgid "Attachments"
-msgstr "Bijlagen"
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
-#: admin/systems/services/glpi/class_glpiAccount.inc:146
-msgid "There is no server with valid glpi database service."
-msgstr "Er is geen server met geldige GLPI database service aanwezig."
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
-#: admin/systems/services/glpi/class_glpiAccount.inc:156
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
-msgstr ""
-"Kan niet verbinden met de GLPI database. Er is geen MySQL extensie "
-"beschikbaar. Controleer uw PHP installatie."
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
-#: admin/systems/services/glpi/class_glpiAccount.inc:166
-msgid "Can't connect to glpi database, check configuration twice."
-msgstr ""
-"Kan niet verbinden met de GLPI database. Controleer uw configuratie a.u.b. "
-"nogmaals."
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
+msgid "File"
+msgstr "Bestand"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
-#: admin/systems/services/glpi/class_glpiAccount.inc:181
-msgid "Download of attachment failed. Attachment was not found on server."
-msgstr ""
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
+msgid "Upload"
+msgstr "Uploaden"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
-#: admin/systems/services/glpi/class_glpiAccount.inc:184
-msgid "Download of attachment failed. Not a valid attachment id."
-msgstr ""
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
+msgid "Status"
+msgstr "Status"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
-#: admin/systems/services/glpi/class_glpiAccount.inc:593
-msgid "Remove inventory"
-msgstr "Inventaris verwijderen"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
+msgid "Filename"
+msgstr "Bestandsnaam"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Deze server heeft inventaris mogelijkheden ingeschakeld. U kunt deze "
-"uitschakelen door de knop hieronder te gebruiken."
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
+msgstr "MIME-type"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
-#: admin/systems/services/glpi/class_glpiAccount.inc:596
-msgid "Add inventory"
-msgstr "Inventaris toevoegen"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
+#, fuzzy
+msgid "cartridge"
+msgstr "Cartridges"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
+#, php-format
 msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
 msgstr ""
-"Deze server heeft inventaris mogelijkheden uitgeschakeld. U kunt deze "
-"inschakelen door de knop hieronder te gebruiken."
+"U kunt dit cartridgetype niet verwijderen, aangezien deze nog steeds in "
+"gebruik is door deze printer(s): '%s'"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
+msgid "Cartridges"
+msgstr "Cartridges"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
+msgid "Action"
+msgstr "Actie"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
+msgid "New monitor"
+msgstr "Nieuwe monitor"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
+msgid "M"
+msgstr "M"
+
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
 #, php-format
 msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
 msgstr ""
-"Kan het opgegeven printertype niet wijzigen naar '%s', aangezien deze "
-"typenaam al bestaat."
+"U kunt deze fabrikant niet verwijderen, aangezien deze nog steeds in gebruik "
+"is door deze systemen: '%s'"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
-msgstr ""
-"Kan het printertype niet verwijderen, aangezien deze nog steeds in gebruik "
-"is door: '%s'"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
+msgid "Please specify a name."
+msgstr "Geef a.u.b. een naam op."
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
-#: admin/systems/services/glpi/class_glpiAccount.inc:656
-#: admin/systems/services/glpi/class_glpiAccount.inc:671
-msgid "N/A"
-msgstr "Niet beschikbaar"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
+msgid "Specified name is already in use, please choose another one."
+msgstr "De opgegeven naam is al in gebruik. Kies a.u.b. een andere naam."
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
-msgid "since"
-msgstr "sinds"
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
+msgstr "Referentie"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
-#: admin/systems/services/glpi/class_glpiAccount.inc:793
-msgid "Glpi"
-msgstr ""
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
+#: admin/systems/services/glpi/glpi_devices.tpl:427
+#: admin/systems/services/glpi/glpi_devices.tpl:492
+#: admin/systems/services/glpi/glpi_devices.tpl:542
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
+#: admin/systems/services/glpi/class_glpiAccount.inc:808
+msgid "Type"
+msgstr "Type"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
+msgid "Choose"
+msgstr "Kies"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:32
+#: admin/systems/services/glpi/class_goGlpiServer.inc:87
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
 #, fuzzy
-msgid "Printer inventory extension"
-msgstr "Voeg printer extensie toe"
+msgid "Inventory database"
+msgstr "gebruiker database"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
+#: admin/systems/services/glpi/class_goGlpiServer.inc:58
 #, fuzzy
-msgid "Supports serial interface"
-msgstr "Ondersteunde interfaces"
+msgid "Inventory database service"
+msgstr "gebruiker database"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
+#: admin/systems/services/glpi/class_goGlpiServer.inc:67
 #, fuzzy
-msgid "Supports parallel interface"
-msgstr "Ondersteunde interfaces"
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
+#: admin/systems/services/glpi/class_goGlpiServer.inc:70
 #, fuzzy
-msgid "Supports usb interface"
-msgstr "Ondersteunde interfaces"
+msgid "The attribute database is empty or contains invalid characters."
+msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
-#: admin/systems/services/glpi/glpi_devices.tpl:17
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
-msgid "Comments"
-msgstr "Opmerkingen"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
+msgid "Services"
+msgstr "Services"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
-#: admin/systems/services/glpi/class_glpiAccount.inc:805
-msgid "Location"
-msgstr "Plaats"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:96
+#, fuzzy
+msgid "Start"
+msgstr "Opstarten"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
-#: admin/systems/services/glpi/glpi_devices.tpl:427
-#: admin/systems/services/glpi/glpi_devices.tpl:492
-#: admin/systems/services/glpi/glpi_devices.tpl:542
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
-#: admin/systems/services/glpi/class_glpiAccount.inc:808
-msgid "Type"
-msgstr "Type"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:97
+msgid "Stop"
+msgstr "Stop"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
+#: admin/systems/services/glpi/class_goGlpiServer.inc:98
 #, fuzzy
-msgid "Cartridge settings"
-msgstr "Cartridges"
+msgid "Restart"
+msgstr "Opnieuw proberen"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:2
-msgid "Warning"
-msgstr "Waarschuwing"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:100
+#, fuzzy
+msgid "Admin"
+msgstr "Beheerders"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Verzeker u ervan dat u dit daadwerkelijk wil doorvoeren, aangezien het "
-"onmogelijk is voor GOsa om de data terug te halen."
+#: admin/systems/services/glpi/class_goGlpiServer.inc:101
+#: admin/systems/services/glpi/goGlpiServer.tpl:20
+msgid "Database"
+msgstr "Database"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Het is aan te raden de huidige inhoud van uw MySQL database op te slaan "
-"alvorens u doorgaat. Indien u dat gedaan heeft drukt u op 'Verwijderen' om "
-"door te gaan of op 'Annuleren' om te annuleren."
+#: admin/systems/services/glpi/class_goGlpiServer.inc:102
+#: admin/systems/services/glpi/goGlpiServer.tpl:12
+msgid "Password"
+msgstr "Wachtwoord"
 
 #: admin/systems/services/glpi/glpi_devices.tpl:2
 msgid "Add/Edit monitor"
 msgstr "Monitor toevoegen/bewerken"
 
-#: admin/systems/services/glpi/glpi_devices.tpl:10
-#: admin/systems/services/glpi/glpi_devices.tpl:105
-#: admin/systems/services/glpi/glpi_devices.tpl:146
-#: admin/systems/services/glpi/glpi_devices.tpl:201
-#: admin/systems/services/glpi/glpi_devices.tpl:257
-#: admin/systems/services/glpi/glpi_devices.tpl:315
-#: admin/systems/services/glpi/glpi_devices.tpl:379
-#: admin/systems/services/glpi/glpi_devices.tpl:451
-#: admin/systems/services/glpi/glpi_devices.tpl:515
-#: admin/systems/services/glpi/glpi_devices.tpl:562
-#: admin/systems/services/glpi/glpi_devices.tpl:615
-#: admin/systems/services/glpi/glpi_devices.tpl:669
-#: admin/systems/services/glpi/glpi_devices.tpl:715
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
-msgid "Name"
-msgstr "Naam"
-
 #: admin/systems/services/glpi/glpi_devices.tpl:33
 msgid "Monitor size"
 msgstr "Monitor grootte"
@@ -512,76 +642,15 @@ msgstr "Moederbord toevoegen/bewerken"
 
 #: admin/systems/services/glpi/glpi_devices.tpl:696
 msgid "Chipset"
-msgstr "Chipset"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:707
-msgid "Add/Edit computer case"
-msgstr "Computer behuizing toevoegen/bewerken"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:742
-msgid "format"
-msgstr "formaat"
-
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
-#: admin/systems/services/glpi/glpi_edit_os.tpl:9
-#: admin/systems/services/glpi/glpi_edit_os.tpl:28
-#: admin/systems/services/glpi/glpi_edit_type.tpl:9
-#: admin/systems/services/glpi/glpi_edit_type.tpl:28
-msgid "Rename"
-msgstr "Hernoemen"
-
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
-#: admin/systems/services/glpi/glpiManufacturer.tpl:13
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
-#: admin/systems/services/glpi/glpi_edit_os.tpl:15
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
-#: admin/systems/services/glpi/glpi_edit_type.tpl:15
-msgid "Close"
-msgstr "Sluiten"
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:1
-msgid "Manage manufacturers"
-msgstr "Fabricanten beheren"
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:8
-#: admin/systems/services/glpi/glpiPrinter.tpl:152
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
-msgid "List of devices"
-msgstr "Lijst met apparaten"
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
-msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
-msgstr ""
-"Deze dialoog maakt het mogelijk om een apparaat te verbinden aan de computer "
-"die u momenteel aan het bewerken bent."
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
-msgid "Display devices matching"
-msgstr "Toon overeenkomende apparaten"
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
-msgid "Regular expression for matching device names"
-msgstr "Reguliere expressie voor overeenkomende apparaat namen"
+msgstr "Chipset"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
-msgid "Use"
-msgstr "Gebruik"
+#: admin/systems/services/glpi/glpi_devices.tpl:707
+msgid "Add/Edit computer case"
+msgstr "Computer behuizing toevoegen/bewerken"
 
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
-#: admin/systems/services/glpi/glpi_edit_os.tpl:24
-#: admin/systems/services/glpi/glpi_edit_type.tpl:24
-msgid "Please enter a new name"
-msgstr "Geef a.u.b. een nieuwe naam op"
+#: admin/systems/services/glpi/glpi_devices.tpl:742
+msgid "format"
+msgstr "formaat"
 
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:88
 #, php-format
@@ -610,26 +679,6 @@ msgstr ""
 msgid "devices"
 msgstr "apparaten"
 
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
-msgid "Actions"
-msgstr "Acties"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-msgid "New monitor"
-msgstr "Nieuwe monitor"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-msgid "M"
-msgstr "M"
-
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:223
 msgid "New mainbord"
 msgstr "Nieuw moederbord"
@@ -747,70 +796,60 @@ msgstr "Geen"
 msgid "Other"
 msgstr "Overige"
 
-#: admin/systems/services/glpi/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
-msgstr "OS-types beheren"
-
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
-msgid "Add/Edit manufacturer"
-msgstr "Fabrikant toevoegen/bewerken"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:6
+msgid "List of users"
+msgstr "Lijst met gebruikers"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
-msgid "Website"
-msgstr "Website"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
+msgstr ""
+"Deze dialoog stelt u in staat om een gebruiker als technisch "
+"verantwoordelijk persoon aan te wijzen."
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
-msgid "Address"
-msgstr "Adres"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:27
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
+msgid "Filters"
+msgstr "Filters"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
-msgid "Phone number"
-msgstr "Telefoonnummer"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:35
+msgid "Display users matching"
+msgstr "Toon overeenkomende gebruikers"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
-msgid "Fax"
-msgstr "Fax"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:37
+msgid "Regular expression for matching user names"
+msgstr "Reguliere expressie voor overeenkomende gebruikersnamen"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr "E-mail"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
+msgstr "Lijst met bijlages"
 
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
-#, php-format
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
 msgstr ""
-"U kunt deze fabrikant niet verwijderen, aangezien deze nog steeds in gebruik "
-"is door deze systemen: '%s'"
-
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
-msgid "Please specify a name."
-msgstr "Geef a.u.b. een naam op."
-
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
-msgid "Specified name is already in use, please choose another one."
-msgstr "De opgegeven naam is al in gebruik. Kies a.u.b. een andere naam."
-
-#: admin/systems/services/glpi/goGlpiServer.tpl:1
-#, fuzzy
-msgid "GLPI database information"
-msgstr "Algemene gebruikersinformatie"
+"Deze dialoog maakt het mogelijk om extra objecten (zoals handleidingen, "
+"documenten, etc.), aan de computer die u momenteel aan het bewerken bent, "
+"toe te voegen."
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:4
-msgid "Logging DB user"
-msgstr "Log DB gebruiker"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
+msgid "Display attachments matching"
+msgstr "Toon overeenkomende bijlages"
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:12
-#: admin/systems/services/glpi/class_goGlpiServer.inc:102
-msgid "Password"
-msgstr "Wachtwoord"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
+msgid "Regular expression for matching attachment names"
+msgstr "Reguliere expressie voor overeenkomende bijlagenamen"
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:20
-#: admin/systems/services/glpi/class_goGlpiServer.inc:101
-msgid "Database"
-msgstr "Database"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
+msgid "Use"
+msgstr "Gebruik"
 
 #: admin/systems/services/glpi/glpiPrinterCartridges.tpl:6
 msgid "List of available cartridge type for this type of printer"
@@ -838,71 +877,180 @@ msgstr "Toon de overeenkomende cartridgetypes"
 msgid "Regular expression for matching cartridge types"
 msgstr "Reguliere expresie voor overeenkomende cartridgetypes"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
+#: admin/systems/services/glpi/goGlpiServer.tpl:1
 #, fuzzy
-msgid "cartridge"
-msgstr "Cartridges"
+msgid "GLPI database information"
+msgstr "Algemene gebruikersinformatie"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
+#: admin/systems/services/glpi/goGlpiServer.tpl:4
+msgid "Logging DB user"
+msgstr "Log DB gebruiker"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
+#: admin/systems/services/glpi/class_glpiAccount.inc:146
+msgid "There is no server with valid glpi database service."
+msgstr "Er is geen server met geldige GLPI database service aanwezig."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
+#: admin/systems/services/glpi/class_glpiAccount.inc:156
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr ""
+"Kan niet verbinden met de GLPI database. Er is geen MySQL extensie "
+"beschikbaar. Controleer uw PHP installatie."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
+#: admin/systems/services/glpi/class_glpiAccount.inc:166
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr ""
+"Kan niet verbinden met de GLPI database. Controleer uw configuratie a.u.b. "
+"nogmaals."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
+#: admin/systems/services/glpi/class_glpiAccount.inc:181
+msgid "Download of attachment failed. Attachment was not found on server."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
+#: admin/systems/services/glpi/class_glpiAccount.inc:184
+msgid "Download of attachment failed. Not a valid attachment id."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
+#: admin/systems/services/glpi/class_glpiAccount.inc:593
+msgid "Remove inventory"
+msgstr "Inventaris verwijderen"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Deze server heeft inventaris mogelijkheden ingeschakeld. U kunt deze "
+"uitschakelen door de knop hieronder te gebruiken."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
+#: admin/systems/services/glpi/class_glpiAccount.inc:596
+msgid "Add inventory"
+msgstr "Inventaris toevoegen"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Deze server heeft inventaris mogelijkheden uitgeschakeld. U kunt deze "
+"inschakelen door de knop hieronder te gebruiken."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
 #, php-format
 msgid ""
-"You can't delete this cartridge type, it is still in use by this printer(s) "
-"'%s'."
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
 msgstr ""
-"U kunt dit cartridgetype niet verwijderen, aangezien deze nog steeds in "
-"gebruik is door deze printer(s): '%s'"
+"Kan het opgegeven printertype niet wijzigen naar '%s', aangezien deze "
+"typenaam al bestaat."
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
-msgid "Cartridges"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr ""
+"Kan het printertype niet verwijderen, aangezien deze nog steeds in gebruik "
+"is door: '%s'"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
+msgid "since"
+msgstr "sinds"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
+#: admin/systems/services/glpi/class_glpiAccount.inc:793
+msgid "Glpi"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
+#, fuzzy
+msgid "Printer inventory extension"
+msgstr "Voeg printer extensie toe"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
+#, fuzzy
+msgid "Supports serial interface"
+msgstr "Ondersteunde interfaces"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
+#, fuzzy
+msgid "Supports parallel interface"
+msgstr "Ondersteunde interfaces"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
+#, fuzzy
+msgid "Supports usb interface"
+msgstr "Ondersteunde interfaces"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
+#: admin/systems/services/glpi/class_glpiAccount.inc:805
+msgid "Location"
+msgstr "Plaats"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
+#, fuzzy
+msgid "Cartridge settings"
 msgstr "Cartridges"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
-msgid "Action"
-msgstr "Actie"
-
-#: admin/systems/services/glpi/glpi_edit_type.tpl:1
-msgid "Manage System-types"
-msgstr "Systeemtypes beheren"
+#: admin/systems/services/glpi/glpi.tpl:9
+msgid "System type"
+msgstr "Systeemtype"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
-msgid "Can't delete this entry, it is still in use."
-msgstr "Kan dit object niet verwijderen, aangezien deze nog in gebruik is."
+#: admin/systems/services/glpi/glpi.tpl:23
+#: admin/systems/services/glpi/class_glpiAccount.inc:804
+msgid "Operating system"
+msgstr "Besturingssysteem"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
-msgid "The selected name is already in use."
-msgstr "De opgegeven naam wordt al gebruikt."
+#: admin/systems/services/glpi/glpi.tpl:96
+msgid "Installed devices"
+msgstr "Geinstalleerde apparaten"
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
-msgid "Reference"
-msgstr "Referentie"
+#: admin/systems/services/glpi/glpi.tpl:112
+msgid "Trading"
+msgstr "Uit-/Omwisseling"
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
-msgid "Choose"
-msgstr "Kies"
+#: admin/systems/services/glpi/glpi.tpl:113
+msgid "Software"
+msgstr "Software"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
-msgid "Attachment"
-msgstr "Bijlage"
+#: admin/systems/services/glpi/glpi.tpl:114
+msgid "Contracts"
+msgstr "Contracten"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
-msgid "File"
-msgstr "Bestand"
+#: admin/systems/services/glpi/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
+msgstr "OS-types beheren"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
-msgid "Upload"
-msgstr "Uploaden"
+#: admin/systems/services/glpi/remove_glpi.tpl:2
+msgid "Warning"
+msgstr "Waarschuwing"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
-msgid "Status"
-msgstr "Status"
+#: admin/systems/services/glpi/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Verzeker u ervan dat u dit daadwerkelijk wil doorvoeren, aangezien het "
+"onmogelijk is voor GOsa om de data terug te halen."
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
-msgid "Filename"
-msgstr "Bestandsnaam"
+#: admin/systems/services/glpi/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Het is aan te raden de huidige inhoud van uw MySQL database op te slaan "
+"alvorens u doorgaat. Indien u dat gedaan heeft drukt u op 'Verwijderen' om "
+"door te gaan of op 'Annuleren' om te annuleren."
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
-msgid "Mime-type"
-msgstr "MIME-type"
+#: admin/systems/services/glpi/glpiManufacturer.tpl:1
+msgid "Manage manufacturers"
+msgstr "Fabricanten beheren"
 
 #: admin/systems/services/glpi/class_glpiAccount.inc:198
 #: admin/systems/services/glpi/class_glpiAccount.inc:204
@@ -993,51 +1141,6 @@ msgstr "Model"
 msgid "Peripheral devices"
 msgstr "Printer"
 
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
-msgid "List of attachments"
-msgstr "Lijst met bijlages"
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
-msgstr ""
-"Deze dialoog maakt het mogelijk om extra objecten (zoals handleidingen, "
-"documenten, etc.), aan de computer die u momenteel aan het bewerken bent, "
-"toe te voegen."
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
-msgid "Display attachments matching"
-msgstr "Toon overeenkomende bijlages"
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
-msgid "Regular expression for matching attachment names"
-msgstr "Reguliere expressie voor overeenkomende bijlagenamen"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:9
-msgid "Printer type"
-msgstr "Printertype"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:39
-msgid "Supported interfaces"
-msgstr "Ondersteunde interfaces"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:48
-msgid "Serial"
-msgstr "Serieel"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:58
-msgid "Parallel"
-msgstr "Parallel"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:68
-msgid "USB"
-msgstr "USB"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:139
-msgid "Installed cartridges"
-msgstr "Geinstalleerde cartridges"
-
 #: admin/systems/services/glpi/class_glpiSelectUser.inc:108
 msgid "Users"
 msgstr "Gebruikers"
@@ -1091,127 +1194,24 @@ msgstr "Basis"
 msgid "Submit department"
 msgstr "Verwerk afdeling"
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
-#, fuzzy
-msgid "attachment"
-msgstr "Bijlage"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
+msgid "List of devices"
+msgstr "Lijst met apparaten"
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
-#, php-format
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
 msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
-msgstr ""
-"U kunt deze bijlage niet verwijderen, aangezien deze nog steeds in gebruik "
-"is door deze systemen: '%s'"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
-msgid "There is no valid file uploaded."
-msgstr "Er is geen geldig bestand ge-upload."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
-msgid "Upload wasn't successfull."
-msgstr "Upload was niet succesvol"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
-#, fuzzy, php-format
-msgid "Missing directory '%s/glpi/' to store glpi uploads."
+"This dialog allows you to attach a device to your currently edited computer."
 msgstr ""
-"De directory '/etc/gosa/glpi/', om GLPI bestanden in te bewaren, ontbreekt. "
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
-msgid "There is already a file with the same name uploaded."
-msgstr "Er bestaat al een bestand met dezelfde naam."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
-#, php-format
-msgid "Can't create file '%s'."
-msgstr "Kan bestand '%s' niet aanmaken."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
-msgid "File is available."
-msgstr "Bestand is beschikbaar"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
-msgid "File is not readable, possibly the file is missing."
-msgstr "Bestand is niet leesbaar. Het is mogelijk dat het bestand ontbreekt."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
-msgid "Currently no file uploaded."
-msgstr "Er is momenteel geen bestand ge-upload."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
-msgid "Mime"
-msgstr "MIME"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
-msgid "This table displays all available attachments."
-msgstr "Deze tabel geeft alle beschikbaare bijlages weer"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
-msgid "empty"
-msgstr "leeg"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
-msgid "Create new attachment"
-msgstr "Nieuwe bijlage aanmaken"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
-msgid "New Attachment"
-msgstr "Nieuwe bijlage"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
-msgid "This name is already in use."
-msgstr "De opgegeven naam wordt al gebruikt."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
-msgid "Please specify a valid name for this attachment."
-msgstr "Geef a.u.b. een geldige naam op voor deze bijlage."
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:32
-#: admin/systems/services/glpi/class_goGlpiServer.inc:87
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-#, fuzzy
-msgid "Inventory database"
-msgstr "gebruiker database"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:58
-#, fuzzy
-msgid "Inventory database service"
-msgstr "gebruiker database"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:67
-#, fuzzy
-msgid "The attribute user is empty or contains invalid characters."
-msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:70
-#, fuzzy
-msgid "The attribute database is empty or contains invalid characters."
-msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-msgid "Services"
-msgstr "Services"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:96
-#, fuzzy
-msgid "Start"
-msgstr "Opstarten"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:97
-msgid "Stop"
-msgstr "Stop"
+"Deze dialoog maakt het mogelijk om een apparaat te verbinden aan de computer "
+"die u momenteel aan het bewerken bent."
 
-#: admin/systems/services/glpi/class_goGlpiServer.inc:98
-#, fuzzy
-msgid "Restart"
-msgstr "Opnieuw proberen"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
+msgid "Display devices matching"
+msgstr "Toon overeenkomende apparaten"
 
-#: admin/systems/services/glpi/class_goGlpiServer.inc:100
-#, fuzzy
-msgid "Admin"
-msgstr "Beheerders"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
+msgid "Regular expression for matching device names"
+msgstr "Reguliere expressie voor overeenkomende apparaat namen"
 
 #~ msgid "You're about to delete the glpi attachment component '%s'."
 #~ msgstr "U staat op het punt het GLPI bijlage component '%s' te verwijderen."
index d3ed43fe7fa4d71811222612ead971ddc6b53e3c..9857f3528bce64f1c0a63454d3ed41d93db979d2 100644 (file)
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-14 13:40+0100\n"
+"POT-Creation-Date: 2008-04-03 16:04+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -14,66 +14,169 @@ msgstr ""
 "X-Poedit-SourceCharset: iso-8859-2\n"
 "X-Poedit-Basepath: tedst\n"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:6
-msgid "List of users"
-msgstr "Lista użytkowników"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
+msgid "Add/Edit manufacturer"
+msgstr "Dodaj/Edytuj producenta"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:20
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
-#: admin/systems/services/glpi/glpiPrinter.tpl:127
-msgid "Information"
-msgstr "Informacja"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
+#: admin/systems/services/glpi/glpi_devices.tpl:10
+#: admin/systems/services/glpi/glpi_devices.tpl:105
+#: admin/systems/services/glpi/glpi_devices.tpl:146
+#: admin/systems/services/glpi/glpi_devices.tpl:201
+#: admin/systems/services/glpi/glpi_devices.tpl:257
+#: admin/systems/services/glpi/glpi_devices.tpl:315
+#: admin/systems/services/glpi/glpi_devices.tpl:379
+#: admin/systems/services/glpi/glpi_devices.tpl:451
+#: admin/systems/services/glpi/glpi_devices.tpl:515
+#: admin/systems/services/glpi/glpi_devices.tpl:562
+#: admin/systems/services/glpi/glpi_devices.tpl:615
+#: admin/systems/services/glpi/glpi_devices.tpl:669
+#: admin/systems/services/glpi/glpi_devices.tpl:715
+msgid "Name"
+msgstr "Imię"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:23
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
+msgid "Website"
+msgstr "Strona WWW"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
+msgid "Address"
+msgstr "Adres"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
+msgid "Phone number"
+msgstr "Numer telefonu"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
+msgid "Fax"
+msgstr "Fax"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr "Email"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
+#: admin/systems/services/glpi/glpi_devices.tpl:17
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
+msgid "Comments"
+msgstr "Komentarze"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
+#: admin/systems/services/glpi/glpi_edit_type.tpl:15
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
+#: admin/systems/services/glpi/glpi_edit_os.tpl:15
+#: admin/systems/services/glpi/glpiManufacturer.tpl:13
+msgid "Close"
+msgstr "Zamknij"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
+#, fuzzy
+msgid "attachment"
+msgstr "Załącznik"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
+#, php-format
 msgid ""
-"This dialog allows you to select a user as technical responsible person."
-msgstr "Ten dialog umożliwia wybranie użytkownika jako kontaktu technicznego."
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
+msgstr ""
+"Nie można usunąć tego załącznika, jest wciąż używany przez system(y) '%s'"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:27
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
-msgid "Filters"
-msgstr "Filtry"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
+msgid "There is no valid file uploaded."
+msgstr "Brak wgranego poprawnego pliku."
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:35
-msgid "Display users matching"
-msgstr "Wyświetl użytkowników pasujących"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
+msgid "Upload wasn't successfull."
+msgstr "Wgrywanie nieudane."
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:37
-msgid "Regular expression for matching user names"
-msgstr "Wyrażenie regularne do dopasowania nazw użytkowników"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
+#, fuzzy, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
+msgstr "Brak katalogu '/etc/gosa/glpi' do przechowywania plików glpi."
 
-#: admin/systems/services/glpi/glpi.tpl:6
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
+msgid "There is already a file with the same name uploaded."
+msgstr "Już istnieje wgrany plik z tą samą nazwą."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
+#, php-format
+msgid "Can't create file '%s'."
+msgstr "Nie można stworzyć pliku '%s'."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
+msgid "File is available."
+msgstr "Plik jest dostępny"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
+msgid "File is not readable, possibly the file is missing."
+msgstr "Nie można czytać pliku, prawdopodobnie plik nie istnieje."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
+msgid "Currently no file uploaded."
+msgstr "Obecnie brak wgranych plików"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
+msgid "Mime"
+msgstr "Mime"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
+msgid "Actions"
+msgstr "Akcje"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
+msgid "This table displays all available attachments."
+msgstr "Ta tabela wyświetla wszystkie dostepne załączniki"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
+msgid "empty"
+msgstr "pusto"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
+msgid "Create new attachment"
+msgstr "Stwórz nowy załącznik"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
+msgid "New Attachment"
+msgstr "Nowy załącznik"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
+msgid "This name is already in use."
+msgstr "Ta nazwa jest już w użyciu."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
+msgid "Please specify a valid name for this attachment."
+msgstr "Proszę podać prawidłową nazwę dla tego załącznika."
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:6
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:4
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:34
-#: admin/systems/services/glpi/glpiPrinter.tpl:6
+#: admin/systems/services/glpi/glpi.tpl:6
 msgid "Generic"
 msgstr "Ogólne"
 
-#: admin/systems/services/glpi/glpi.tpl:9
-msgid "System type"
-msgstr "Typ systemu"
+#: admin/systems/services/glpi/glpiPrinter.tpl:9
+msgid "Printer type"
+msgstr "Typ drukarki"
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:18
+#: admin/systems/services/glpi/glpiPrinter.tpl:32
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
 #: admin/systems/services/glpi/glpi.tpl:18
 #: admin/systems/services/glpi/glpi.tpl:32
 #: admin/systems/services/glpi/glpi.tpl:46
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
-#: admin/systems/services/glpi/glpiPrinter.tpl:18
-#: admin/systems/services/glpi/glpiPrinter.tpl:32
 msgid "edit"
 msgstr "edytuj"
 
-#: admin/systems/services/glpi/glpi.tpl:23
-#: admin/systems/services/glpi/class_glpiAccount.inc:804
-msgid "Operating system"
-msgstr "System operacyjny"
-
-#: admin/systems/services/glpi/glpi.tpl:37
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpiPrinter.tpl:23
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
 #: admin/systems/services/glpi/glpi_devices.tpl:24
 #: admin/systems/services/glpi/glpi_devices.tpl:123
 #: admin/systems/services/glpi/glpi_devices.tpl:164
@@ -87,44 +190,125 @@ msgstr "System operacyjny"
 #: admin/systems/services/glpi/glpi_devices.tpl:633
 #: admin/systems/services/glpi/glpi_devices.tpl:687
 #: admin/systems/services/glpi/glpi_devices.tpl:733
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpi.tpl:37
 #: admin/systems/services/glpi/class_glpiAccount.inc:809
-#: admin/systems/services/glpi/glpiPrinter.tpl:23
 msgid "Manufacturer"
 msgstr "Producent"
 
-#: admin/systems/services/glpi/glpi.tpl:52
+#: admin/systems/services/glpi/glpiPrinter.tpl:39
+msgid "Supported interfaces"
+msgstr "Wspierane interfejsy"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:48
+msgid "Serial"
+msgstr "Szeregowy"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:58
+msgid "Parallel"
+msgstr "Równoległy"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:68
+msgid "USB"
+msgstr "USB"
+
 #: admin/systems/services/glpi/glpiPrinter.tpl:80
+#: admin/systems/services/glpi/glpi.tpl:52
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: admin/systems/services/glpi/glpi.tpl:56
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
-#: admin/systems/services/glpi/class_glpiAccount.inc:806
-#: admin/systems/services/glpi/glpiPrinter.tpl:94
-msgid "Contact person"
-msgstr "Osoba kontaktowa"
+#: admin/systems/services/glpi/glpiPrinter.tpl:83
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
+#: admin/systems/services/glpi/glpi.tpl:66
+#: admin/systems/services/glpi/class_glpiAccount.inc:802
+msgid "Technical responsible"
+msgstr "Osoba techniczna"
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:88
+#: admin/systems/services/glpi/glpiPrinter.tpl:99
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
 #: admin/systems/services/glpi/glpi.tpl:61
 #: admin/systems/services/glpi/glpi.tpl:71
 #: admin/systems/services/glpi/glpi.tpl:106
 #: admin/systems/services/glpi/glpiManufacturer.tpl:7
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
-#: admin/systems/services/glpi/glpiPrinter.tpl:88
-#: admin/systems/services/glpi/glpiPrinter.tpl:99
 msgid "Edit"
 msgstr "Edytuj"
 
-#: admin/systems/services/glpi/glpi.tpl:66
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
-#: admin/systems/services/glpi/class_glpiAccount.inc:802
-#: admin/systems/services/glpi/glpiPrinter.tpl:83
-msgid "Technical responsible"
-msgstr "Osoba techniczna"
+#: admin/systems/services/glpi/glpiPrinter.tpl:94
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
+#: admin/systems/services/glpi/glpi.tpl:56
+#: admin/systems/services/glpi/class_glpiAccount.inc:806
+msgid "Contact person"
+msgstr "Osoba kontaktowa"
 
-#: admin/systems/services/glpi/glpi.tpl:79
+#: admin/systems/services/glpi/glpiPrinter.tpl:107
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
+#: admin/systems/services/glpi/glpi.tpl:117
+#: admin/systems/services/glpi/class_glpiAccount.inc:810
+msgid "Attachments"
+msgstr "Załączniki"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:127
+#: admin/systems/services/glpi/glpiSelectUser.tpl:20
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
+msgid "Information"
+msgstr "Informacja"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:139
+msgid "Installed cartridges"
+msgstr "Zainstalowane kartridźe"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:152
+#: admin/systems/services/glpi/glpiManufacturer.tpl:8
+msgid "Remove"
+msgstr "Usuń"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:1
+msgid "Manage System-types"
+msgstr "Zarządzaj typami systemów"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:9
+#: admin/systems/services/glpi/glpi_edit_type.tpl:28
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
+#: admin/systems/services/glpi/glpi_edit_os.tpl:9
+#: admin/systems/services/glpi/glpi_edit_os.tpl:28
+msgid "Rename"
+msgstr "Zmień nazwę"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:24
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
+#: admin/systems/services/glpi/glpi_edit_os.tpl:24
+msgid "Please enter a new name"
+msgstr "Proszę podać nową nazwę."
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
+msgid "Can't delete this entry, it is still in use."
+msgstr "Nie można usunąć tego elementu, ponieważ jest wciąż w użyciu."
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
+#: admin/systems/services/glpi/class_glpiAccount.inc:656
+#: admin/systems/services/glpi/class_glpiAccount.inc:671
+msgid "N/A"
+msgstr "B/D"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
+msgid "The selected name is already in use."
+msgstr "Wybrana nazwie już jest w użyciu."
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
+msgstr "Załącznik"
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
 #: admin/systems/services/glpi/glpi_devices.tpl:112
 #: admin/systems/services/glpi/glpi_devices.tpl:153
 #: admin/systems/services/glpi/glpi_devices.tpl:208
@@ -137,205 +321,156 @@ msgstr "Osoba techniczna"
 #: admin/systems/services/glpi/glpi_devices.tpl:622
 #: admin/systems/services/glpi/glpi_devices.tpl:676
 #: admin/systems/services/glpi/glpi_devices.tpl:722
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
+#: admin/systems/services/glpi/glpi.tpl:79
 #: admin/systems/services/glpi/class_glpiAccount.inc:803
 msgid "Comment"
 msgstr "Komentarz"
 
-#: admin/systems/services/glpi/glpi.tpl:96
-msgid "Installed devices"
-msgstr "Zainstalowane urządzenia"
-
-#: admin/systems/services/glpi/glpi.tpl:112
-msgid "Trading"
-msgstr "Handel"
-
-#: admin/systems/services/glpi/glpi.tpl:113
-msgid "Software"
-msgstr "Oprogramowanie"
-
-#: admin/systems/services/glpi/glpi.tpl:114
-msgid "Contracts"
-msgstr "Kontrakty"
-
-#: admin/systems/services/glpi/glpi.tpl:117
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
-#: admin/systems/services/glpi/class_glpiAccount.inc:810
-#: admin/systems/services/glpi/glpiPrinter.tpl:107
-msgid "Attachments"
-msgstr "Załączniki"
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
-#: admin/systems/services/glpi/class_glpiAccount.inc:146
-msgid "There is no server with valid glpi database service."
-msgstr "Brak serwera z poprawną usługą bazy glpi."
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
-#: admin/systems/services/glpi/class_glpiAccount.inc:156
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
-msgstr ""
-"Nie można połączyć się z bazą danych glpi, brak rozszerzenia php-mysql."
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
-#: admin/systems/services/glpi/class_glpiAccount.inc:166
-msgid "Can't connect to glpi database, check configuration twice."
-msgstr ""
-"Nie można połączyć się z bazą danych glpi, proszę sprawdzić konfigurację."
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
-#: admin/systems/services/glpi/class_glpiAccount.inc:181
-msgid "Download of attachment failed. Attachment was not found on server."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
-#: admin/systems/services/glpi/class_glpiAccount.inc:184
-msgid "Download of attachment failed. Not a valid attachment id."
-msgstr ""
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
+msgid "File"
+msgstr "Plik"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
-#: admin/systems/services/glpi/class_glpiAccount.inc:593
-msgid "Remove inventory"
-msgstr "Usuń inwentarz"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
+msgid "Upload"
+msgstr "Wgraj"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Ten serwer posiada cechy inwentarza. Można je wyłączyć klikając poniżej"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
+msgid "Status"
+msgstr "Status"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
-#: admin/systems/services/glpi/class_glpiAccount.inc:596
-msgid "Add inventory"
-msgstr "Dodaj inwentarz"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
+msgid "Filename"
+msgstr "Nazwa pliku"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
-msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Ten serwer nie posiada cech inwentarza. Można je włączyć klikając poniżej."
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
+msgstr "Typ-Mime"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
+#, fuzzy
+msgid "cartridge"
+msgstr "Kartridźe"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
 #, php-format
 msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
 msgstr ""
-"Nie można zmienić nazwy typu drukarki na '%s' ponieważ ta nazwa typu jest "
-"już używana."
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
-msgstr "Nie można usunąć typu drukarki, jest wciąż w użyciu przez '%s'."
+"Nie można usunąć tego typu kartridża. Jest wciąż używany przez drukarkę(i) '%"
+"s'."
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
-#: admin/systems/services/glpi/class_glpiAccount.inc:656
-#: admin/systems/services/glpi/class_glpiAccount.inc:671
-msgid "N/A"
-msgstr "B/D"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
+msgid "Cartridges"
+msgstr "Kartridźe"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
-msgid "since"
-msgstr "od"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
+msgid "Action"
+msgstr "Akcja"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
-#: admin/systems/services/glpi/class_glpiAccount.inc:793
-msgid "Glpi"
-msgstr "Glpi"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
+msgid "Delete"
+msgstr "Usuń"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
-#, fuzzy
-msgid "Printer inventory extension"
-msgstr "Dodaj rozszerzenie drukarki"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
+msgid "New monitor"
+msgstr "Nowy monitor"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
-msgid "Supports serial interface"
-msgstr "Wspiera interfejs szeregowy"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
+msgid "M"
+msgstr "M"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
-msgid "Supports parallel interface"
-msgstr "Wspiera interfejs równoległy"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr ""
+"Nie można usunąć tego producenta, jest on wciąż używany przez te system(y) '%"
+"s'"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
-msgid "Supports usb interface"
-msgstr "Wspiera interfejs USB"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
+msgid "Please specify a name."
+msgstr "Proszę podać nazwę"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
-#: admin/systems/services/glpi/glpi_devices.tpl:17
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
-msgid "Comments"
-msgstr "Komentarze"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
+msgid "Specified name is already in use, please choose another one."
+msgstr "Podana nazwa jest już używana, proszę wybrać inną."
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
-#: admin/systems/services/glpi/class_glpiAccount.inc:805
-msgid "Location"
-msgstr "Lokalizacja"
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
+msgstr "Referencja"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
 #: admin/systems/services/glpi/glpi_devices.tpl:427
 #: admin/systems/services/glpi/glpi_devices.tpl:492
 #: admin/systems/services/glpi/glpi_devices.tpl:542
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
 #: admin/systems/services/glpi/class_glpiAccount.inc:808
 msgid "Type"
 msgstr "Typ"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
-msgid "Cartridge settings"
-msgstr "Ustawienia kartridźy"
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
+msgid "Choose"
+msgstr "Wybierz"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:2
-msgid "Warning"
-msgstr "Ostrzeżenie"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:32
+#: admin/systems/services/glpi/class_goGlpiServer.inc:87
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
+msgid "Inventory database"
+msgstr "Baza inwentarza"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Proszę upewnić się, że faktycznie chcesz wykonać tą operację. Nie ma "
-"możliwości odwrócenia tego procesu."
+#: admin/systems/services/glpi/class_goGlpiServer.inc:58
+#, fuzzy
+msgid "Inventory database service"
+msgstr "Baza inwentarza"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Przed wykonaniem tej operacji zaleca się wykonanie kopii bezpieczeństwa bazy "
-"MySQL. Naciśnij 'Usuń' aby kontynuować, lub 'Anuluj' aby przerwać."
+#: admin/systems/services/glpi/class_goGlpiServer.inc:67
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "Atrybut użytkownik jest pusty lub zawiera nieprawidłowe znaki."
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:70
+msgid "The attribute database is empty or contains invalid characters."
+msgstr "Podany atrybut bazy danych jest pusty lub zawiera nieprawidłowe znaki."
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
+msgid "Services"
+msgstr "Usługi"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:96
+msgid "Start"
+msgstr "Start"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:97
+msgid "Stop"
+msgstr "Zatrzymaj"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:98
+msgid "Restart"
+msgstr "Restart"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:100
+msgid "Admin"
+msgstr "Admin"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:101
+#: admin/systems/services/glpi/goGlpiServer.tpl:20
+msgid "Database"
+msgstr "Baza"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:102
+#: admin/systems/services/glpi/goGlpiServer.tpl:12
+msgid "Password"
+msgstr "Hasło"
 
 #: admin/systems/services/glpi/glpi_devices.tpl:2
 msgid "Add/Edit monitor"
 msgstr "Dodaj/Edytuj monitor"
 
-#: admin/systems/services/glpi/glpi_devices.tpl:10
-#: admin/systems/services/glpi/glpi_devices.tpl:105
-#: admin/systems/services/glpi/glpi_devices.tpl:146
-#: admin/systems/services/glpi/glpi_devices.tpl:201
-#: admin/systems/services/glpi/glpi_devices.tpl:257
-#: admin/systems/services/glpi/glpi_devices.tpl:315
-#: admin/systems/services/glpi/glpi_devices.tpl:379
-#: admin/systems/services/glpi/glpi_devices.tpl:451
-#: admin/systems/services/glpi/glpi_devices.tpl:515
-#: admin/systems/services/glpi/glpi_devices.tpl:562
-#: admin/systems/services/glpi/glpi_devices.tpl:615
-#: admin/systems/services/glpi/glpi_devices.tpl:669
-#: admin/systems/services/glpi/glpi_devices.tpl:715
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
-msgid "Name"
-msgstr "Imię"
-
 #: admin/systems/services/glpi/glpi_devices.tpl:33
 msgid "Monitor size"
 msgstr "Rozmiar monitora"
@@ -478,91 +613,31 @@ msgstr "Przepustowość"
 
 #: admin/systems/services/glpi/glpi_devices.tpl:607
 msgid "Add/Edit processor"
-msgstr "Dodaj/Edytuj procesor"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:642
-msgid "Frequence"
-msgstr "Częstotliwość"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:649
-msgid "Default frequence"
-msgstr "Domyślna częstotliwość"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:661
-msgid "Add/Edit motherboard"
-msgstr "Dodaj/Edytuj płytę główną"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:696
-msgid "Chipset"
-msgstr "Chipset"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:707
-msgid "Add/Edit computer case"
-msgstr "Dodaj/Zmień obudowę komputera"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:742
-msgid "format"
-msgstr "format"
-
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
-#: admin/systems/services/glpi/glpi_edit_os.tpl:9
-#: admin/systems/services/glpi/glpi_edit_os.tpl:28
-#: admin/systems/services/glpi/glpi_edit_type.tpl:9
-#: admin/systems/services/glpi/glpi_edit_type.tpl:28
-msgid "Rename"
-msgstr "Zmień nazwę"
-
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
-#: admin/systems/services/glpi/glpiManufacturer.tpl:13
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
-#: admin/systems/services/glpi/glpi_edit_os.tpl:15
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
-#: admin/systems/services/glpi/glpi_edit_type.tpl:15
-msgid "Close"
-msgstr "Zamknij"
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:1
-msgid "Manage manufacturers"
-msgstr "Zarządzaj producentami"
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:8
-#: admin/systems/services/glpi/glpiPrinter.tpl:152
-msgid "Remove"
-msgstr "Usuń"
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
-msgid "List of devices"
-msgstr "Lista urządzeń"
+msgstr "Dodaj/Edytuj procesor"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
-msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
-msgstr ""
-"Ten dialog umożliwia przypięcie urządzenia do obecnie edytowanego komputera."
+#: admin/systems/services/glpi/glpi_devices.tpl:642
+msgid "Frequence"
+msgstr "Częstotliwość"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
-msgid "Display devices matching"
-msgstr "Wyświetl pasujące urządzenia"
+#: admin/systems/services/glpi/glpi_devices.tpl:649
+msgid "Default frequence"
+msgstr "Domyślna częstotliwość"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
-msgid "Regular expression for matching device names"
-msgstr "Wyrażenie regularne dla dopasowania nazw urządzeń"
+#: admin/systems/services/glpi/glpi_devices.tpl:661
+msgid "Add/Edit motherboard"
+msgstr "Dodaj/Edytuj płytę główną"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
-msgid "Use"
-msgstr "Użyj"
+#: admin/systems/services/glpi/glpi_devices.tpl:696
+msgid "Chipset"
+msgstr "Chipset"
 
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
-#: admin/systems/services/glpi/glpi_edit_os.tpl:24
-#: admin/systems/services/glpi/glpi_edit_type.tpl:24
-msgid "Please enter a new name"
-msgstr "Proszę podać nową nazwę."
+#: admin/systems/services/glpi/glpi_devices.tpl:707
+msgid "Add/Edit computer case"
+msgstr "Dodaj/Zmień obudowę komputera"
+
+#: admin/systems/services/glpi/glpi_devices.tpl:742
+msgid "format"
+msgstr "format"
 
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:88
 #, php-format
@@ -591,26 +666,6 @@ msgstr ""
 msgid "devices"
 msgstr "urządzenia"
 
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
-msgid "Actions"
-msgstr "Akcje"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
-msgid "Delete"
-msgstr "Usuń"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-msgid "New monitor"
-msgstr "Nowy monitor"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-msgid "M"
-msgstr "M"
-
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:223
 msgid "New mainbord"
 msgstr "Nowa płyta główna"
@@ -728,69 +783,57 @@ msgstr "Brak"
 msgid "Other"
 msgstr "Inne"
 
-#: admin/systems/services/glpi/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
-msgstr "Zarządzaj typami systemów operacyjnych"
-
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
-msgid "Add/Edit manufacturer"
-msgstr "Dodaj/Edytuj producenta"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:6
+msgid "List of users"
+msgstr "Lista użytkowników"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
-msgid "Website"
-msgstr "Strona WWW"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
+msgstr "Ten dialog umożliwia wybranie użytkownika jako kontaktu technicznego."
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
-msgid "Address"
-msgstr "Adres"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:27
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
+msgid "Filters"
+msgstr "Filtry"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
-msgid "Phone number"
-msgstr "Numer telefonu"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:35
+msgid "Display users matching"
+msgstr "Wyświetl użytkowników pasujących"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
-msgid "Fax"
-msgstr "Fax"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:37
+msgid "Regular expression for matching user names"
+msgstr "Wyrażenie regularne do dopasowania nazw użytkowników"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr "Email"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
+msgstr "Lista załączników"
 
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
-#, php-format
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
 msgstr ""
-"Nie można usunąć tego producenta, jest on wciąż używany przez te system(y) '%"
-"s'"
-
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
-msgid "Please specify a name."
-msgstr "Proszę podać nazwę"
-
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
-msgid "Specified name is already in use, please choose another one."
-msgstr "Podana nazwa jest już używana, proszę wybrać inną."
-
-#: admin/systems/services/glpi/goGlpiServer.tpl:1
-msgid "GLPI database information"
-msgstr "informacje bazy danych GLPI"
+"Ten dialog umożliwia przypisanie dodatkowych obiektów (np dokumentacja) do "
+"obecnie edytowanego komputera."
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:4
-msgid "Logging DB user"
-msgstr "Użytkownik bazy logowania"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
+msgid "Display attachments matching"
+msgstr "Wyświetl pasujące załączniki"
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:12
-#: admin/systems/services/glpi/class_goGlpiServer.inc:102
-msgid "Password"
-msgstr "Hasło"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
+msgid "Regular expression for matching attachment names"
+msgstr "Wyrażenie regularne dla dopasowania nazw załączników"
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:20
-#: admin/systems/services/glpi/class_goGlpiServer.inc:101
-msgid "Database"
-msgstr "Baza"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
+msgid "Use"
+msgstr "Użyj"
 
 #: admin/systems/services/glpi/glpiPrinterCartridges.tpl:6
 msgid "List of available cartridge type for this type of printer"
@@ -817,71 +860,168 @@ msgstr "Wyświetl pasujące typy katridży"
 msgid "Regular expression for matching cartridge types"
 msgstr "Wyrażenie regularne dla dopasowania kartridźy"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
-#, fuzzy
-msgid "cartridge"
-msgstr "Kartridźe"
+#: admin/systems/services/glpi/goGlpiServer.tpl:1
+msgid "GLPI database information"
+msgstr "informacje bazy danych GLPI"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
+#: admin/systems/services/glpi/goGlpiServer.tpl:4
+msgid "Logging DB user"
+msgstr "Użytkownik bazy logowania"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
+#: admin/systems/services/glpi/class_glpiAccount.inc:146
+msgid "There is no server with valid glpi database service."
+msgstr "Brak serwera z poprawną usługą bazy glpi."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
+#: admin/systems/services/glpi/class_glpiAccount.inc:156
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr ""
+"Nie można połączyć się z bazą danych glpi, brak rozszerzenia php-mysql."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
+#: admin/systems/services/glpi/class_glpiAccount.inc:166
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr ""
+"Nie można połączyć się z bazą danych glpi, proszę sprawdzić konfigurację."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
+#: admin/systems/services/glpi/class_glpiAccount.inc:181
+msgid "Download of attachment failed. Attachment was not found on server."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
+#: admin/systems/services/glpi/class_glpiAccount.inc:184
+msgid "Download of attachment failed. Not a valid attachment id."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
+#: admin/systems/services/glpi/class_glpiAccount.inc:593
+msgid "Remove inventory"
+msgstr "Usuń inwentarz"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Ten serwer posiada cechy inwentarza. Można je wyłączyć klikając poniżej"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
+#: admin/systems/services/glpi/class_glpiAccount.inc:596
+msgid "Add inventory"
+msgstr "Dodaj inwentarz"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Ten serwer nie posiada cech inwentarza. Można je włączyć klikając poniżej."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
 #, php-format
 msgid ""
-"You can't delete this cartridge type, it is still in use by this printer(s) "
-"'%s'."
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
 msgstr ""
-"Nie można usunąć tego typu kartridża. Jest wciąż używany przez drukarkę(i) '%"
-"s'."
+"Nie można zmienić nazwy typu drukarki na '%s' ponieważ ta nazwa typu jest "
+"już używana."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr "Nie można usunąć typu drukarki, jest wciąż w użyciu przez '%s'."
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
+msgid "since"
+msgstr "od"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
+#: admin/systems/services/glpi/class_glpiAccount.inc:793
+msgid "Glpi"
+msgstr "Glpi"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
+#, fuzzy
+msgid "Printer inventory extension"
+msgstr "Dodaj rozszerzenie drukarki"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
+msgid "Supports serial interface"
+msgstr "Wspiera interfejs szeregowy"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
+msgid "Supports parallel interface"
+msgstr "Wspiera interfejs równoległy"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
+msgid "Supports usb interface"
+msgstr "Wspiera interfejs USB"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
-msgid "Cartridges"
-msgstr "Kartridźe"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
+#: admin/systems/services/glpi/class_glpiAccount.inc:805
+msgid "Location"
+msgstr "Lokalizacja"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
-msgid "Action"
-msgstr "Akcja"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
+msgid "Cartridge settings"
+msgstr "Ustawienia kartridźy"
 
-#: admin/systems/services/glpi/glpi_edit_type.tpl:1
-msgid "Manage System-types"
-msgstr "Zarządzaj typami systemów"
+#: admin/systems/services/glpi/glpi.tpl:9
+msgid "System type"
+msgstr "Typ systemu"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
-msgid "Can't delete this entry, it is still in use."
-msgstr "Nie można usunąć tego elementu, ponieważ jest wciąż w użyciu."
+#: admin/systems/services/glpi/glpi.tpl:23
+#: admin/systems/services/glpi/class_glpiAccount.inc:804
+msgid "Operating system"
+msgstr "System operacyjny"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
-msgid "The selected name is already in use."
-msgstr "Wybrana nazwie już jest w użyciu."
+#: admin/systems/services/glpi/glpi.tpl:96
+msgid "Installed devices"
+msgstr "Zainstalowane urządzenia"
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
-msgid "Reference"
-msgstr "Referencja"
+#: admin/systems/services/glpi/glpi.tpl:112
+msgid "Trading"
+msgstr "Handel"
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
-msgid "Choose"
-msgstr "Wybierz"
+#: admin/systems/services/glpi/glpi.tpl:113
+msgid "Software"
+msgstr "Oprogramowanie"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
-msgid "Attachment"
-msgstr "Załącznik"
+#: admin/systems/services/glpi/glpi.tpl:114
+msgid "Contracts"
+msgstr "Kontrakty"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
-msgid "File"
-msgstr "Plik"
+#: admin/systems/services/glpi/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
+msgstr "Zarządzaj typami systemów operacyjnych"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
-msgid "Upload"
-msgstr "Wgraj"
+#: admin/systems/services/glpi/remove_glpi.tpl:2
+msgid "Warning"
+msgstr "Ostrzeżenie"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
-msgid "Status"
-msgstr "Status"
+#: admin/systems/services/glpi/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Proszę upewnić się, że faktycznie chcesz wykonać tą operację. Nie ma "
+"możliwości odwrócenia tego procesu."
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
-msgid "Filename"
-msgstr "Nazwa pliku"
+#: admin/systems/services/glpi/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Przed wykonaniem tej operacji zaleca się wykonanie kopii bezpieczeństwa bazy "
+"MySQL. Naciśnij 'Usuń' aby kontynuować, lub 'Anuluj' aby przerwać."
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
-msgid "Mime-type"
-msgstr "Typ-Mime"
+#: admin/systems/services/glpi/glpiManufacturer.tpl:1
+msgid "Manage manufacturers"
+msgstr "Zarządzaj producentami"
 
 #: admin/systems/services/glpi/class_glpiAccount.inc:198
 #: admin/systems/services/glpi/class_glpiAccount.inc:204
@@ -964,50 +1104,6 @@ msgstr "Model"
 msgid "Peripheral devices"
 msgstr "Urządzenie peryferyjne"
 
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
-msgid "List of attachments"
-msgstr "Lista załączników"
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
-msgstr ""
-"Ten dialog umożliwia przypisanie dodatkowych obiektów (np dokumentacja) do "
-"obecnie edytowanego komputera."
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
-msgid "Display attachments matching"
-msgstr "Wyświetl pasujące załączniki"
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
-msgid "Regular expression for matching attachment names"
-msgstr "Wyrażenie regularne dla dopasowania nazw załączników"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:9
-msgid "Printer type"
-msgstr "Typ drukarki"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:39
-msgid "Supported interfaces"
-msgstr "Wspierane interfejsy"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:48
-msgid "Serial"
-msgstr "Szeregowy"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:58
-msgid "Parallel"
-msgstr "Równoległy"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:68
-msgid "USB"
-msgstr "USB"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:139
-msgid "Installed cartridges"
-msgstr "Zainstalowane kartridźe"
-
 #: admin/systems/services/glpi/class_glpiSelectUser.inc:108
 msgid "Users"
 msgstr "Użytkownicy"
@@ -1061,119 +1157,23 @@ msgstr "Kontener"
 msgid "Submit department"
 msgstr "Zatwierdź departament"
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
-#, fuzzy
-msgid "attachment"
-msgstr "Załącznik"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
+msgid "List of devices"
+msgstr "Lista urządzeń"
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
-#, php-format
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
 msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
+"This dialog allows you to attach a device to your currently edited computer."
 msgstr ""
-"Nie można usunąć tego załącznika, jest wciąż używany przez system(y) '%s'"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
-msgid "There is no valid file uploaded."
-msgstr "Brak wgranego poprawnego pliku."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
-msgid "Upload wasn't successfull."
-msgstr "Wgrywanie nieudane."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
-#, fuzzy, php-format
-msgid "Missing directory '%s/glpi/' to store glpi uploads."
-msgstr "Brak katalogu '/etc/gosa/glpi' do przechowywania plików glpi."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
-msgid "There is already a file with the same name uploaded."
-msgstr "Już istnieje wgrany plik z tą samą nazwą."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
-#, php-format
-msgid "Can't create file '%s'."
-msgstr "Nie można stworzyć pliku '%s'."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
-msgid "File is available."
-msgstr "Plik jest dostępny"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
-msgid "File is not readable, possibly the file is missing."
-msgstr "Nie można czytać pliku, prawdopodobnie plik nie istnieje."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
-msgid "Currently no file uploaded."
-msgstr "Obecnie brak wgranych plików"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
-msgid "Mime"
-msgstr "Mime"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
-msgid "This table displays all available attachments."
-msgstr "Ta tabela wyświetla wszystkie dostepne załączniki"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
-msgid "empty"
-msgstr "pusto"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
-msgid "Create new attachment"
-msgstr "Stwórz nowy załącznik"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
-msgid "New Attachment"
-msgstr "Nowy załącznik"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
-msgid "This name is already in use."
-msgstr "Ta nazwa jest już w użyciu."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
-msgid "Please specify a valid name for this attachment."
-msgstr "Proszę podać prawidłową nazwę dla tego załącznika."
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:32
-#: admin/systems/services/glpi/class_goGlpiServer.inc:87
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-msgid "Inventory database"
-msgstr "Baza inwentarza"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:58
-#, fuzzy
-msgid "Inventory database service"
-msgstr "Baza inwentarza"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:67
-msgid "The attribute user is empty or contains invalid characters."
-msgstr "Atrybut użytkownik jest pusty lub zawiera nieprawidłowe znaki."
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:70
-msgid "The attribute database is empty or contains invalid characters."
-msgstr "Podany atrybut bazy danych jest pusty lub zawiera nieprawidłowe znaki."
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-msgid "Services"
-msgstr "Usługi"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:96
-msgid "Start"
-msgstr "Start"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:97
-msgid "Stop"
-msgstr "Zatrzymaj"
+"Ten dialog umożliwia przypięcie urządzenia do obecnie edytowanego komputera."
 
-#: admin/systems/services/glpi/class_goGlpiServer.inc:98
-msgid "Restart"
-msgstr "Restart"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
+msgid "Display devices matching"
+msgstr "Wyświetl pasujące urządzenia"
 
-#: admin/systems/services/glpi/class_goGlpiServer.inc:100
-msgid "Admin"
-msgstr "Admin"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
+msgid "Regular expression for matching device names"
+msgstr "Wyrażenie regularne dla dopasowania nazw urządzeń"
 
 #~ msgid "You're about to delete the glpi attachment component '%s'."
 #~ msgstr "Zamierzasz usunąć załącznik glpi '%s'."
index 9bccd23855966a4e4ebdbed56bc1361521605a11..0aea9835e86f30a57da08d0f0a05e2d7f511bda9 100644 (file)
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-14 13:40+0100\n"
+"POT-Creation-Date: 2008-04-03 16:04+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -14,69 +14,186 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: poEdit 1.3.1\n"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:6
-msgid "List of users"
-msgstr "Список пользователей"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
+#, fuzzy
+msgid "Add/Edit manufacturer"
+msgstr "Редактиовать объект"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:20
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
-#: admin/systems/services/glpi/glpiPrinter.tpl:127
-msgid "Information"
-msgstr "Информация"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
+#: admin/systems/services/glpi/glpi_devices.tpl:10
+#: admin/systems/services/glpi/glpi_devices.tpl:105
+#: admin/systems/services/glpi/glpi_devices.tpl:146
+#: admin/systems/services/glpi/glpi_devices.tpl:201
+#: admin/systems/services/glpi/glpi_devices.tpl:257
+#: admin/systems/services/glpi/glpi_devices.tpl:315
+#: admin/systems/services/glpi/glpi_devices.tpl:379
+#: admin/systems/services/glpi/glpi_devices.tpl:451
+#: admin/systems/services/glpi/glpi_devices.tpl:515
+#: admin/systems/services/glpi/glpi_devices.tpl:562
+#: admin/systems/services/glpi/glpi_devices.tpl:615
+#: admin/systems/services/glpi/glpi_devices.tpl:669
+#: admin/systems/services/glpi/glpi_devices.tpl:715
+msgid "Name"
+msgstr "Фамилия"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:23
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
+#, fuzzy
+msgid "Website"
+msgstr "запись"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
+msgid "Address"
+msgstr "Адрес"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
+#, fuzzy
+msgid "Phone number"
+msgstr "Телефонные номера"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
+msgid "Fax"
+msgstr "Факс"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr "Email"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
+#: admin/systems/services/glpi/glpi_devices.tpl:17
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
+#, fuzzy
+msgid "Comments"
+msgstr "Контакт"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
+#: admin/systems/services/glpi/glpi_edit_type.tpl:15
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
+#: admin/systems/services/glpi/glpi_edit_os.tpl:15
+#: admin/systems/services/glpi/glpiManufacturer.tpl:13
+#, fuzzy
+msgid "Close"
+msgstr "Выбрать"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
+#, fuzzy
+msgid "attachment"
+msgstr "подразделения"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
+#, php-format
 msgid ""
-"This dialog allows you to select a user as technical responsible person."
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:27
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
-msgid "Filters"
-msgstr "Фильтры"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
+#, fuzzy
+msgid "There is no valid file uploaded."
+msgstr "Файл небыл загружен"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:35
-msgid "Display users matching"
-msgstr "Фильтр"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
+#, fuzzy
+msgid "Upload wasn't successfull."
+msgstr "Экспорт успешен."
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:37
-msgid "Regular expression for matching user names"
-msgstr "Регулярное выражение, соответствующее именам пользователей"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
+#, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
+msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:6
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
+#, fuzzy
+msgid "There is already a file with the same name uploaded."
+msgstr ""
+"Пользователь с таким регистрационным именем в базе данных уже существует."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
+#, fuzzy, php-format
+msgid "Can't create file '%s'."
+msgstr "Удалить"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
+msgid "File is available."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
+msgid "File is not readable, possibly the file is missing."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
+#, fuzzy
+msgid "Currently no file uploaded."
+msgstr "Файл небыл загружен"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
+#, fuzzy
+msgid "Mime"
+msgstr "Мобильный"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
+msgid "Actions"
+msgstr "Действия"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
+msgid "This table displays all available attachments."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
+#, fuzzy
+msgid "empty"
+msgstr "Шаблон"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
+#, fuzzy
+msgid "Create new attachment"
+msgstr "Подразделение"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
+#, fuzzy
+msgid "New Attachment"
+msgstr "подразделения"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
+#, fuzzy
+msgid "This name is already in use."
+msgstr "Указанное имя уже используется."
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
+#, fuzzy
+msgid "Please specify a valid name for this attachment."
+msgstr "Укажите корректный номер телефона."
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:6
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:4
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:34
-#: admin/systems/services/glpi/glpiPrinter.tpl:6
+#: admin/systems/services/glpi/glpi.tpl:6
 msgid "Generic"
 msgstr "Общее"
 
-#: admin/systems/services/glpi/glpi.tpl:9
+#: admin/systems/services/glpi/glpiPrinter.tpl:9
 #, fuzzy
-msgid "System type"
-msgstr "СиÑ\81Ñ\82емÑ\8b"
+msgid "Printer type"
+msgstr "Ð\98мÑ\8f Ð¿Ñ\80инÑ\82еÑ\80а"
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:18
+#: admin/systems/services/glpi/glpiPrinter.tpl:32
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
 #: admin/systems/services/glpi/glpi.tpl:18
 #: admin/systems/services/glpi/glpi.tpl:32
 #: admin/systems/services/glpi/glpi.tpl:46
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
-#: admin/systems/services/glpi/glpiPrinter.tpl:18
-#: admin/systems/services/glpi/glpiPrinter.tpl:32
 #, fuzzy
 msgid "edit"
 msgstr "Изменить"
 
-#: admin/systems/services/glpi/glpi.tpl:23
-#: admin/systems/services/glpi/class_glpiAccount.inc:804
-#, fuzzy
-msgid "Operating system"
-msgstr "Удалить"
-
-#: admin/systems/services/glpi/glpi.tpl:37
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpiPrinter.tpl:23
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
 #: admin/systems/services/glpi/glpi_devices.tpl:24
 #: admin/systems/services/glpi/glpi_devices.tpl:123
 #: admin/systems/services/glpi/glpi_devices.tpl:164
@@ -90,46 +207,137 @@ msgstr "Удалить"
 #: admin/systems/services/glpi/glpi_devices.tpl:633
 #: admin/systems/services/glpi/glpi_devices.tpl:687
 #: admin/systems/services/glpi/glpi_devices.tpl:733
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpi.tpl:37
 #: admin/systems/services/glpi/class_glpiAccount.inc:809
-#: admin/systems/services/glpi/glpiPrinter.tpl:23
 msgid "Manufacturer"
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:52
+#: admin/systems/services/glpi/glpiPrinter.tpl:39
+#, fuzzy
+msgid "Supported interfaces"
+msgstr "Сетевой принтер"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:48
+#, fuzzy
+msgid "Serial"
+msgstr "терминалы"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:58
+#, fuzzy
+msgid "Parallel"
+msgstr "Переменная"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:68
+msgid "USB"
+msgstr ""
+
 #: admin/systems/services/glpi/glpiPrinter.tpl:80
+#: admin/systems/services/glpi/glpi.tpl:52
 #, fuzzy
 msgid "Contacts"
 msgstr "Контакт"
 
-#: admin/systems/services/glpi/glpi.tpl:56
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
-#: admin/systems/services/glpi/class_glpiAccount.inc:806
-#: admin/systems/services/glpi/glpiPrinter.tpl:94
-#, fuzzy
-msgid "Contact person"
-msgstr "Контакт"
+#: admin/systems/services/glpi/glpiPrinter.tpl:83
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
+#: admin/systems/services/glpi/glpi.tpl:66
+#: admin/systems/services/glpi/class_glpiAccount.inc:802
+msgid "Technical responsible"
+msgstr ""
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:88
+#: admin/systems/services/glpi/glpiPrinter.tpl:99
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
 #: admin/systems/services/glpi/glpi.tpl:61
 #: admin/systems/services/glpi/glpi.tpl:71
 #: admin/systems/services/glpi/glpi.tpl:106
 #: admin/systems/services/glpi/glpiManufacturer.tpl:7
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
-#: admin/systems/services/glpi/glpiPrinter.tpl:88
-#: admin/systems/services/glpi/glpiPrinter.tpl:99
 msgid "Edit"
 msgstr "Изменить"
 
-#: admin/systems/services/glpi/glpi.tpl:66
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
-#: admin/systems/services/glpi/class_glpiAccount.inc:802
-#: admin/systems/services/glpi/glpiPrinter.tpl:83
-msgid "Technical responsible"
+#: admin/systems/services/glpi/glpiPrinter.tpl:94
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
+#: admin/systems/services/glpi/glpi.tpl:56
+#: admin/systems/services/glpi/class_glpiAccount.inc:806
+#, fuzzy
+msgid "Contact person"
+msgstr "Контакт"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:107
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
+#: admin/systems/services/glpi/glpi.tpl:117
+#: admin/systems/services/glpi/class_glpiAccount.inc:810
+#, fuzzy
+msgid "Attachments"
+msgstr "подразделения"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:127
+#: admin/systems/services/glpi/glpiSelectUser.tpl:20
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
+msgid "Information"
+msgstr "Информация"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:139
+#, fuzzy
+msgid "Installed cartridges"
+msgstr "Клиентские устройства"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:152
+#: admin/systems/services/glpi/glpiManufacturer.tpl:8
+msgid "Remove"
+msgstr "Удалить"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:1
+#, fuzzy
+msgid "Manage System-types"
+msgstr "Системы"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:9
+#: admin/systems/services/glpi/glpi_edit_type.tpl:28
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
+#: admin/systems/services/glpi/glpi_edit_os.tpl:9
+#: admin/systems/services/glpi/glpi_edit_os.tpl:28
+#, fuzzy
+msgid "Rename"
+msgstr "Имя сервера"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:24
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
+#: admin/systems/services/glpi/glpi_edit_os.tpl:24
+#, fuzzy
+msgid "Please enter a new name"
+msgstr "Введите адрес сервера"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
+msgid "Can't delete this entry, it is still in use."
 msgstr ""
 
-#: admin/systems/services/glpi/glpi.tpl:79
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
+#: admin/systems/services/glpi/class_glpiAccount.inc:656
+#: admin/systems/services/glpi/class_glpiAccount.inc:671
+msgid "N/A"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
+#, fuzzy
+msgid "The selected name is already in use."
+msgstr "Указанное имя уже используется."
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
+#, fuzzy
+msgid "Attachment"
+msgstr "подразделения"
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
 #: admin/systems/services/glpi/glpi_devices.tpl:112
 #: admin/systems/services/glpi/glpi_devices.tpl:153
 #: admin/systems/services/glpi/glpi_devices.tpl:208
@@ -142,224 +350,170 @@ msgstr ""
 #: admin/systems/services/glpi/glpi_devices.tpl:622
 #: admin/systems/services/glpi/glpi_devices.tpl:676
 #: admin/systems/services/glpi/glpi_devices.tpl:722
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
+#: admin/systems/services/glpi/glpi.tpl:79
 #: admin/systems/services/glpi/class_glpiAccount.inc:803
 #, fuzzy
 msgid "Comment"
 msgstr "Контакт"
 
-#: admin/systems/services/glpi/glpi.tpl:96
-#, fuzzy
-msgid "Installed devices"
-msgstr "Клиентские устройства"
-
-#: admin/systems/services/glpi/glpi.tpl:112
-#, fuzzy
-msgid "Trading"
-msgstr "Затенение"
-
-#: admin/systems/services/glpi/glpi.tpl:113
-#, fuzzy
-msgid "Software"
-msgstr "Адм. единица"
-
-#: admin/systems/services/glpi/glpi.tpl:114
-#, fuzzy
-msgid "Contracts"
-msgstr "Контакт"
-
-#: admin/systems/services/glpi/glpi.tpl:117
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
-#: admin/systems/services/glpi/class_glpiAccount.inc:810
-#: admin/systems/services/glpi/glpiPrinter.tpl:107
-#, fuzzy
-msgid "Attachments"
-msgstr "подразделения"
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
-#: admin/systems/services/glpi/class_glpiAccount.inc:146
-msgid "There is no server with valid glpi database service."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
-#: admin/systems/services/glpi/class_glpiAccount.inc:156
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
 #, fuzzy
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
-msgstr "Ð\9dе Ñ\83даеÑ\82Ñ\81Ñ\8f Ð¿Ð¾Ð´ÐºÐ»Ñ\8eÑ\87иÑ\82Ñ\8cÑ\81Ñ\8f Ðº Ð±Ð°Ð·Ðµ Ð¶Ñ\83Ñ\80налов, Ð¾Ñ\82Ñ\87еÑ\82Ñ\8b Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ñ\8b Ð½Ðµ Ð±Ñ\83дÑ\83Ñ\82!"
+msgid "File"
+msgstr "ФайлÑ\8b"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
-#: admin/systems/services/glpi/class_glpiAccount.inc:166
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
 #, fuzzy
-msgid "Can't connect to glpi database, check configuration twice."
-msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
-#: admin/systems/services/glpi/class_glpiAccount.inc:181
-msgid "Download of attachment failed. Attachment was not found on server."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
-#: admin/systems/services/glpi/class_glpiAccount.inc:184
-msgid "Download of attachment failed. Not a valid attachment id."
-msgstr ""
+msgid "Upload"
+msgstr "Загрузка процессора"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
-#: admin/systems/services/glpi/class_glpiAccount.inc:593
-#, fuzzy
-msgid "Remove inventory"
-msgstr "Удалить объект"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
+msgid "Status"
+msgstr "Состояние"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
 #, fuzzy
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
+msgid "Filename"
+msgstr "Имя сервера"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
-#: admin/systems/services/glpi/class_glpiAccount.inc:596
-#, fuzzy
-msgid "Add inventory"
-msgstr "Добавить объект"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
+#, fuzzy
+msgid "Mime-type"
+msgstr "Тип"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
 #, fuzzy
-msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
+msgid "cartridge"
+msgstr "Клиентские устройства"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
 #, php-format
 msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
-#: admin/systems/services/glpi/class_glpiAccount.inc:656
-#: admin/systems/services/glpi/class_glpiAccount.inc:671
-msgid "N/A"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
+msgid "Cartridges"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
-#, fuzzy
-msgid "since"
-msgstr "Работает с"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
+msgid "Action"
+msgstr "Действие"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
-#: admin/systems/services/glpi/class_glpiAccount.inc:793
-msgid "Glpi"
-msgstr ""
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
+msgid "Delete"
+msgstr "Удалить"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
 #, fuzzy
-msgid "Printer inventory extension"
-msgstr "УдалиÑ\82Ñ\8c Ð¿Ð°Ñ\80амеÑ\82Ñ\80Ñ\8b"
+msgid "New monitor"
+msgstr "Ð\9dовÑ\8bй Ð¿Ð°Ñ\80олÑ\8c"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
 #, fuzzy
-msgid "Supports serial interface"
-msgstr "СеÑ\82евой Ð¿Ñ\80инÑ\82еÑ\80"
+msgid "M"
+msgstr "Ð\9cб"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
-#, fuzzy
-msgid "Supports parallel interface"
-msgstr "Сетевой принтер"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
 #, fuzzy
-msgid "Supports usb interface"
-msgstr "СеÑ\82евой Ð¿Ñ\80инÑ\82еÑ\80"
+msgid "Please specify a name."
+msgstr "Ð\92ведиÑ\82е ÐºÐ¾Ñ\80Ñ\80екÑ\82ное Ð¸Ð¼Ñ\8f Ð¿Ð¾Ð»Ñ\8cзоваÑ\82елÑ\8f!"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
-#: admin/systems/services/glpi/glpi_devices.tpl:17
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
 #, fuzzy
-msgid "Comments"
-msgstr "Ð\9aонÑ\82акÑ\82"
+msgid "Specified name is already in use, please choose another one."
+msgstr "Ð\93Ñ\80Ñ\83ппа Ñ\81 Ñ\82аким Ð¸Ð¼ÐµÐ½ÐµÐ¼ Ñ\83же Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82."
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
-#: admin/systems/services/glpi/class_glpiAccount.inc:805
-msgid "Location"
-msgstr "Ð\9cеÑ\81Ñ\82оположение"
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
+#, fuzzy
+msgid "Reference"
+msgstr "СÑ\81Ñ\8bлки"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
 #: admin/systems/services/glpi/glpi_devices.tpl:427
 #: admin/systems/services/glpi/glpi_devices.tpl:492
 #: admin/systems/services/glpi/glpi_devices.tpl:542
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
 #: admin/systems/services/glpi/class_glpiAccount.inc:808
 msgid "Type"
 msgstr "Тип"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
+msgid "Choose"
+msgstr "Выбрать"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:32
+#: admin/systems/services/glpi/class_goGlpiServer.inc:87
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
 #, fuzzy
-msgid "Cartridge settings"
-msgstr "Ð\9fоÑ\87Ñ\82овÑ\8bе Ð½Ð°Ñ\81Ñ\82Ñ\80ойки Ð¿Ð¾Ð»Ñ\8cзоваÑ\82елÑ\8f"
+msgid "Inventory database"
+msgstr "Ð\91азÑ\8b Ð´Ð°Ð½Ð½Ñ\8bÑ\85"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:2
-msgid "Warning"
-msgstr "Предупреждение"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:58
+#, fuzzy
+msgid "Inventory database service"
+msgstr "Базы данных"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
-"сможет отменить результаты этой операции."
+#: admin/systems/services/glpi/class_goGlpiServer.inc:67
+#, fuzzy
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:10
+#: admin/systems/services/glpi/class_goGlpiServer.inc:70
 #, fuzzy
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+msgid "The attribute database is empty or contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
+msgid "Services"
+msgstr "Сервисы"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:96
+#, fuzzy
+msgid "Start"
+msgstr "Запуск"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:97
+msgid "Stop"
 msgstr ""
-"Лучше всего перед удалением сохранить резервную копию текущего дерева LDAP в "
-"файл. Если вы сделали это и действительно хотите выполнить удаление, нажмите "
-"<i>Удалить</i>, иначе нажмите <i>Отмена</i>."
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:98
+#, fuzzy
+msgid "Restart"
+msgstr "Повторить"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:100
+#, fuzzy
+msgid "Admin"
+msgstr "DN администратора"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:101
+#: admin/systems/services/glpi/goGlpiServer.tpl:20
+#, fuzzy
+msgid "Database"
+msgstr "Базы данных"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:102
+#: admin/systems/services/glpi/goGlpiServer.tpl:12
+msgid "Password"
+msgstr "Пароль"
 
 #: admin/systems/services/glpi/glpi_devices.tpl:2
 #, fuzzy
 msgid "Add/Edit monitor"
 msgstr "Редактиовать объект"
 
-#: admin/systems/services/glpi/glpi_devices.tpl:10
-#: admin/systems/services/glpi/glpi_devices.tpl:105
-#: admin/systems/services/glpi/glpi_devices.tpl:146
-#: admin/systems/services/glpi/glpi_devices.tpl:201
-#: admin/systems/services/glpi/glpi_devices.tpl:257
-#: admin/systems/services/glpi/glpi_devices.tpl:315
-#: admin/systems/services/glpi/glpi_devices.tpl:379
-#: admin/systems/services/glpi/glpi_devices.tpl:451
-#: admin/systems/services/glpi/glpi_devices.tpl:515
-#: admin/systems/services/glpi/glpi_devices.tpl:562
-#: admin/systems/services/glpi/glpi_devices.tpl:615
-#: admin/systems/services/glpi/glpi_devices.tpl:669
-#: admin/systems/services/glpi/glpi_devices.tpl:715
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
-msgid "Name"
-msgstr "Фамилия"
-
 #: admin/systems/services/glpi/glpi_devices.tpl:33
 #, fuzzy
 msgid "Monitor size"
@@ -542,84 +696,17 @@ msgstr "Клавиатура"
 #: admin/systems/services/glpi/glpi_devices.tpl:696
 #, fuzzy
 msgid "Chipset"
-msgstr "сброс"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:707
-#, fuzzy
-msgid "Add/Edit computer case"
-msgstr "не полный"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:742
-#, fuzzy
-msgid "format"
-msgstr "Порт"
-
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
-#: admin/systems/services/glpi/glpi_edit_os.tpl:9
-#: admin/systems/services/glpi/glpi_edit_os.tpl:28
-#: admin/systems/services/glpi/glpi_edit_type.tpl:9
-#: admin/systems/services/glpi/glpi_edit_type.tpl:28
-#, fuzzy
-msgid "Rename"
-msgstr "Имя сервера"
-
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
-#: admin/systems/services/glpi/glpiManufacturer.tpl:13
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
-#: admin/systems/services/glpi/glpi_edit_os.tpl:15
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
-#: admin/systems/services/glpi/glpi_edit_type.tpl:15
-#, fuzzy
-msgid "Close"
-msgstr "Выбрать"
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:1
-#, fuzzy
-msgid "Manage manufacturers"
-msgstr "Редактиовать объект"
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:8
-#: admin/systems/services/glpi/glpiPrinter.tpl:152
-msgid "Remove"
-msgstr "Удалить"
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
-#, fuzzy
-msgid "List of devices"
-msgstr "Список пользователей"
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
-msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
-msgstr ""
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
-#, fuzzy
-msgid "Display devices matching"
-msgstr "Показать подходяшие адреса"
-
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
-#, fuzzy
-msgid "Regular expression for matching device names"
-msgstr "Регулярное выражение, соответствующее именам пользователей"
+msgstr "сброс"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
+#: admin/systems/services/glpi/glpi_devices.tpl:707
 #, fuzzy
-msgid "Use"
-msgstr "Ð\9fолÑ\8cзоваÑ\82елÑ\8c"
+msgid "Add/Edit computer case"
+msgstr "не Ð¿Ð¾Ð»Ð½Ñ\8bй"
 
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
-#: admin/systems/services/glpi/glpi_edit_os.tpl:24
-#: admin/systems/services/glpi/glpi_edit_type.tpl:24
+#: admin/systems/services/glpi/glpi_devices.tpl:742
 #, fuzzy
-msgid "Please enter a new name"
-msgstr "Ð\92ведиÑ\82е Ð°Ð´Ñ\80еÑ\81 Ñ\81еÑ\80веÑ\80а"
+msgid "format"
+msgstr "Ð\9fоÑ\80Ñ\82"
 
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:88
 #, php-format
@@ -647,28 +734,6 @@ msgstr ""
 msgid "devices"
 msgstr "Устройства"
 
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
-msgid "Actions"
-msgstr "Действия"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
-msgid "Delete"
-msgstr "Удалить"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-#, fuzzy
-msgid "New monitor"
-msgstr "Новый пароль"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-#, fuzzy
-msgid "M"
-msgstr "Мб"
-
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:223
 #, fuzzy
 msgid "New mainbord"
@@ -802,74 +867,59 @@ msgstr "нет"
 msgid "Other"
 msgstr "Фильтры"
 
-#: admin/systems/services/glpi/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:6
+msgid "List of users"
+msgstr "Список пользователей"
+
+#: admin/systems/services/glpi/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
 msgstr ""
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
-#, fuzzy
-msgid "Add/Edit manufacturer"
-msgstr "Редактиовать объект"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:27
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
+msgid "Filters"
+msgstr "Фильтры"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
-#, fuzzy
-msgid "Website"
-msgstr "запись"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:35
+msgid "Display users matching"
+msgstr "Фильтр"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
-msgid "Address"
-msgstr "Ð\90дÑ\80еÑ\81"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:37
+msgid "Regular expression for matching user names"
+msgstr "РегÑ\83лÑ\8fÑ\80ное Ð²Ñ\8bÑ\80ажение, Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89ее Ð¸Ð¼ÐµÐ½Ð°Ð¼ Ð¿Ð¾Ð»Ñ\8cзоваÑ\82елей"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
 #, fuzzy
-msgid "Phone number"
-msgstr "Телефонные номера"
-
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
-msgid "Fax"
-msgstr "Факс"
-
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr "Email"
+msgid "List of attachments"
+msgstr "Список подразделений"
 
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
-#, php-format
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
-#, fuzzy
-msgid "Please specify a name."
-msgstr "Введите корректное имя пользователя!"
-
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
 #, fuzzy
-msgid "Specified name is already in use, please choose another one."
-msgstr "Ð\93Ñ\80Ñ\83ппа Ñ\81 Ñ\82аким Ð¸Ð¼ÐµÐ½ÐµÐ¼ Ñ\83же Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82."
+msgid "Display attachments matching"
+msgstr "Шаблон Ð´Ð»Ñ\8f Ð¿Ð¾Ð´Ñ\80азделений"
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:1
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
 #, fuzzy
-msgid "GLPI database information"
-msgstr "Общая информация о пользователе"
-
-#: admin/systems/services/glpi/goGlpiServer.tpl:4
-msgid "Logging DB user"
-msgstr ""
-
-#: admin/systems/services/glpi/goGlpiServer.tpl:12
-#: admin/systems/services/glpi/class_goGlpiServer.inc:102
-msgid "Password"
-msgstr "Пароль"
+msgid "Regular expression for matching attachment names"
+msgstr "Регулярное выражение, соответствующее именам подразделений"
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:20
-#: admin/systems/services/glpi/class_goGlpiServer.inc:101
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
 #, fuzzy
-msgid "Database"
-msgstr "Ð\91азÑ\8b Ð´Ð°Ð½Ð½Ñ\8bÑ\85"
+msgid "Use"
+msgstr "Ð\9fолÑ\8cзоваÑ\82елÑ\8c"
 
 #: admin/systems/services/glpi/glpiPrinterCartridges.tpl:6
 msgid "List of available cartridge type for this type of printer"
@@ -894,77 +944,187 @@ msgstr "Показать совпадения номеров"
 msgid "Regular expression for matching cartridge types"
 msgstr "Регулярное выражение для поиска адреса"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
+#: admin/systems/services/glpi/goGlpiServer.tpl:1
 #, fuzzy
-msgid "cartridge"
-msgstr "Ð\9aлиенÑ\82Ñ\81кие Ñ\83Ñ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва"
+msgid "GLPI database information"
+msgstr "Ð\9eбÑ\89аÑ\8f Ð¸Ð½Ñ\84оÑ\80маÑ\86иÑ\8f Ð¾ Ð¿Ð¾Ð»Ñ\8cзоваÑ\82еле"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
-#, php-format
+#: admin/systems/services/glpi/goGlpiServer.tpl:4
+msgid "Logging DB user"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
+#: admin/systems/services/glpi/class_glpiAccount.inc:146
+msgid "There is no server with valid glpi database service."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
+#: admin/systems/services/glpi/class_glpiAccount.inc:156
+#, fuzzy
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
+#: admin/systems/services/glpi/class_glpiAccount.inc:166
+#, fuzzy
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
+#: admin/systems/services/glpi/class_glpiAccount.inc:181
+msgid "Download of attachment failed. Attachment was not found on server."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
+#: admin/systems/services/glpi/class_glpiAccount.inc:184
+msgid "Download of attachment failed. Not a valid attachment id."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
+#: admin/systems/services/glpi/class_glpiAccount.inc:593
+#, fuzzy
+msgid "Remove inventory"
+msgstr "Удалить объект"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
+#, fuzzy
 msgid ""
-"You can't delete this cartridge type, it is still in use by this printer(s) "
-"'%s'."
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
 msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
-msgid "Cartridges"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
+#: admin/systems/services/glpi/class_glpiAccount.inc:596
+#, fuzzy
+msgid "Add inventory"
+msgstr "Добавить объект"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
+#, fuzzy
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
 msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
-msgid "Action"
-msgstr "Действие"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
+#, php-format
+msgid ""
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
+msgstr ""
 
-#: admin/systems/services/glpi/glpi_edit_type.tpl:1
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
 #, fuzzy
-msgid "Manage System-types"
-msgstr "СиÑ\81Ñ\82емÑ\8b"
+msgid "since"
+msgstr "РабоÑ\82аеÑ\82 Ñ\81"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
-msgid "Can't delete this entry, it is still in use."
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
+#: admin/systems/services/glpi/class_glpiAccount.inc:793
+msgid "Glpi"
 msgstr ""
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
+#, fuzzy
+msgid "Printer inventory extension"
+msgstr "Удалить параметры"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
+#, fuzzy
+msgid "Supports serial interface"
+msgstr "Сетевой принтер"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
+#, fuzzy
+msgid "Supports parallel interface"
+msgstr "Сетевой принтер"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
+#, fuzzy
+msgid "Supports usb interface"
+msgstr "Сетевой принтер"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
+#: admin/systems/services/glpi/class_glpiAccount.inc:805
+msgid "Location"
+msgstr "Местоположение"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
+#, fuzzy
+msgid "Cartridge settings"
+msgstr "Почтовые настройки пользователя"
+
+#: admin/systems/services/glpi/glpi.tpl:9
 #, fuzzy
-msgid "The selected name is already in use."
-msgstr "Указанное Ð¸Ð¼Ñ\8f Ñ\83же Ð¸Ñ\81полÑ\8cзÑ\83еÑ\82Ñ\81Ñ\8f."
+msgid "System type"
+msgstr "СиÑ\81Ñ\82емÑ\8b"
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
+#: admin/systems/services/glpi/glpi.tpl:23
+#: admin/systems/services/glpi/class_glpiAccount.inc:804
 #, fuzzy
-msgid "Reference"
-msgstr "СÑ\81Ñ\8bлки"
+msgid "Operating system"
+msgstr "УдалиÑ\82Ñ\8c"
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
-msgid "Choose"
-msgstr "Выбрать"
+#: admin/systems/services/glpi/glpi.tpl:96
+#, fuzzy
+msgid "Installed devices"
+msgstr "Клиентские устройства"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
+#: admin/systems/services/glpi/glpi.tpl:112
 #, fuzzy
-msgid "Attachment"
-msgstr "подÑ\80азделениÑ\8f"
+msgid "Trading"
+msgstr "Ð\97аÑ\82енение"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
+#: admin/systems/services/glpi/glpi.tpl:113
 #, fuzzy
-msgid "File"
-msgstr "ФайлÑ\8b"
+msgid "Software"
+msgstr "Ð\90дм. ÐµÐ´Ð¸Ð½Ð¸Ñ\86а"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
+#: admin/systems/services/glpi/glpi.tpl:114
 #, fuzzy
-msgid "Upload"
-msgstr "Ð\97агÑ\80Ñ\83зка Ð¿Ñ\80оÑ\86еÑ\81Ñ\81оÑ\80а"
+msgid "Contracts"
+msgstr "Ð\9aонÑ\82акÑ\82"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
-msgid "Status"
-msgstr "Состояние"
+#: admin/systems/services/glpi/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
+msgstr ""
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
+#: admin/systems/services/glpi/remove_glpi.tpl:2
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: admin/systems/services/glpi/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
+"сможет отменить результаты этой операции."
+
+#: admin/systems/services/glpi/remove_glpi.tpl:10
 #, fuzzy
-msgid "Filename"
-msgstr "Имя сервера"
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Лучше всего перед удалением сохранить резервную копию текущего дерева LDAP в "
+"файл. Если вы сделали это и действительно хотите выполнить удаление, нажмите "
+"<i>Удалить</i>, иначе нажмите <i>Отмена</i>."
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
+#: admin/systems/services/glpi/glpiManufacturer.tpl:1
 #, fuzzy
-msgid "Mime-type"
-msgstr "Тип"
+msgid "Manage manufacturers"
+msgstr "РедакÑ\82иоваÑ\82Ñ\8c Ð¾Ð±Ñ\8aекÑ\82"
 
 #: admin/systems/services/glpi/class_glpiAccount.inc:198
 #: admin/systems/services/glpi/class_glpiAccount.inc:204
@@ -1049,56 +1209,6 @@ msgstr "Модель"
 msgid "Peripheral devices"
 msgstr "Сетевые устройства"
 
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
-#, fuzzy
-msgid "List of attachments"
-msgstr "Список подразделений"
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
-msgstr ""
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
-#, fuzzy
-msgid "Display attachments matching"
-msgstr "Шаблон для подразделений"
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
-#, fuzzy
-msgid "Regular expression for matching attachment names"
-msgstr "Регулярное выражение, соответствующее именам подразделений"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:9
-#, fuzzy
-msgid "Printer type"
-msgstr "Имя принтера"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:39
-#, fuzzy
-msgid "Supported interfaces"
-msgstr "Сетевой принтер"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:48
-#, fuzzy
-msgid "Serial"
-msgstr "терминалы"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:58
-#, fuzzy
-msgid "Parallel"
-msgstr "Переменная"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:68
-msgid "USB"
-msgstr ""
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:139
-#, fuzzy
-msgid "Installed cartridges"
-msgstr "Клиентские устройства"
-
 #: admin/systems/services/glpi/class_glpiSelectUser.inc:108
 msgid "Users"
 msgstr "Пользователи"
@@ -1159,135 +1269,25 @@ msgstr "Ветка"
 msgid "Submit department"
 msgstr "Показать подразделения"
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
 #, fuzzy
-msgid "attachment"
-msgstr "подÑ\80азделениÑ\8f"
+msgid "List of devices"
+msgstr "СпиÑ\81ок Ð¿Ð¾Ð»Ñ\8cзоваÑ\82елей"
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
-#, php-format
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
 msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
-#, fuzzy
-msgid "There is no valid file uploaded."
-msgstr "Файл небыл загружен"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
-#, fuzzy
-msgid "Upload wasn't successfull."
-msgstr "Экспорт успешен."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
-#, php-format
-msgid "Missing directory '%s/glpi/' to store glpi uploads."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
-#, fuzzy
-msgid "There is already a file with the same name uploaded."
-msgstr ""
-"Пользователь с таким регистрационным именем в базе данных уже существует."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
-#, fuzzy, php-format
-msgid "Can't create file '%s'."
-msgstr "Удалить"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
-msgid "File is available."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
-msgid "File is not readable, possibly the file is missing."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
-#, fuzzy
-msgid "Currently no file uploaded."
-msgstr "Файл небыл загружен"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
-#, fuzzy
-msgid "Mime"
-msgstr "Мобильный"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
-msgid "This table displays all available attachments."
-msgstr ""
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
-#, fuzzy
-msgid "empty"
-msgstr "Шаблон"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
-#, fuzzy
-msgid "Create new attachment"
-msgstr "Подразделение"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
-#, fuzzy
-msgid "New Attachment"
-msgstr "подразделения"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
-#, fuzzy
-msgid "This name is already in use."
-msgstr "Указанное имя уже используется."
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
-#, fuzzy
-msgid "Please specify a valid name for this attachment."
-msgstr "Укажите корректный номер телефона."
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:32
-#: admin/systems/services/glpi/class_goGlpiServer.inc:87
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-#, fuzzy
-msgid "Inventory database"
-msgstr "Базы данных"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:58
-#, fuzzy
-msgid "Inventory database service"
-msgstr "Базы данных"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:67
-#, fuzzy
-msgid "The attribute user is empty or contains invalid characters."
-msgstr "Неправильное указание таймаута '%s'"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:70
-#, fuzzy
-msgid "The attribute database is empty or contains invalid characters."
-msgstr "Неправильное указание таймаута '%s'"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-msgid "Services"
-msgstr "Сервисы"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:96
-#, fuzzy
-msgid "Start"
-msgstr "Запуск"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:97
-msgid "Stop"
+"This dialog allows you to attach a device to your currently edited computer."
 msgstr ""
 
-#: admin/systems/services/glpi/class_goGlpiServer.inc:98
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
 #, fuzzy
-msgid "Restart"
-msgstr "Ð\9fовÑ\82оÑ\80иÑ\82Ñ\8c"
+msgid "Display devices matching"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ð¿Ð¾Ð´Ñ\85одÑ\8fÑ\88ие Ð°Ð´Ñ\80еÑ\81а"
 
-#: admin/systems/services/glpi/class_goGlpiServer.inc:100
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
 #, fuzzy
-msgid "Admin"
-msgstr "DN администратора"
+msgid "Regular expression for matching device names"
+msgstr "Регулярное выражение, соответствующее именам пользователей"
 
 #, fuzzy
 #~ msgid "You're about to delete the glpi attachment component '%s'."
index 9b1f26415c6ca78196967004c1c607069d4ae686..6eed2af72e592d63510f9768deeb512913fce132 100644 (file)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-14 13:40+0100\n"
+"POT-Creation-Date: 2008-04-03 16:04+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -16,66 +16,168 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:6
-msgid "List of users"
-msgstr "用户列表"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
+msgid "Add/Edit manufacturer"
+msgstr "添加/修改 生产商"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:20
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
-#: admin/systems/services/glpi/glpiPrinter.tpl:127
-msgid "Information"
-msgstr "提示信息"
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
+#: admin/systems/services/glpi/glpi_devices.tpl:10
+#: admin/systems/services/glpi/glpi_devices.tpl:105
+#: admin/systems/services/glpi/glpi_devices.tpl:146
+#: admin/systems/services/glpi/glpi_devices.tpl:201
+#: admin/systems/services/glpi/glpi_devices.tpl:257
+#: admin/systems/services/glpi/glpi_devices.tpl:315
+#: admin/systems/services/glpi/glpi_devices.tpl:379
+#: admin/systems/services/glpi/glpi_devices.tpl:451
+#: admin/systems/services/glpi/glpi_devices.tpl:515
+#: admin/systems/services/glpi/glpi_devices.tpl:562
+#: admin/systems/services/glpi/glpi_devices.tpl:615
+#: admin/systems/services/glpi/glpi_devices.tpl:669
+#: admin/systems/services/glpi/glpi_devices.tpl:715
+msgid "Name"
+msgstr "名称"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:23
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
+msgid "Website"
+msgstr "网站"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
+msgid "Address"
+msgstr "住址"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
+msgid "Phone number"
+msgstr "电话号码"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
+msgid "Fax"
+msgstr "传真"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr "邮件"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
+#: admin/systems/services/glpi/glpi_devices.tpl:17
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
+msgid "Comments"
+msgstr "注释"
+
+#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
+#: admin/systems/services/glpi/glpi_edit_type.tpl:15
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
+#: admin/systems/services/glpi/glpi_edit_os.tpl:15
+#: admin/systems/services/glpi/glpiManufacturer.tpl:13
+msgid "Close"
+msgstr "关闭"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
+#, fuzzy
+msgid "attachment"
+msgstr "附件"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
+#, php-format
 msgid ""
-"This dialog allows you to select a user as technical responsible person."
-msgstr "这个对话框允许您选择一个用户作为技术负责人。"
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
+msgstr "您不能删除这个附件,它仍然被这些系统使用 '%s'"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:27
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
-msgid "Filters"
-msgstr "过滤器"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
+msgid "There is no valid file uploaded."
+msgstr "没有上传有效文件。"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:35
-msgid "Display users matching"
-msgstr "显示匹配的用户"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
+msgid "Upload wasn't successfull."
+msgstr "上传没有成功。"
 
-#: admin/systems/services/glpi/glpiSelectUser.tpl:37
-msgid "Regular expression for matching user names"
-msgstr "匹配用户名的正则表达式"
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
+#, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
+msgstr "缺少目录 '%s/glpi/' 来保存 glpi 上传。"
 
-#: admin/systems/services/glpi/glpi.tpl:6
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
+msgid "There is already a file with the same name uploaded."
+msgstr "已经由同名文件上传。"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
+#, php-format
+msgid "Can't create file '%s'."
+msgstr "无法创建文件 '%s'。"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
+msgid "File is available."
+msgstr "文件可用。"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
+msgid "File is not readable, possibly the file is missing."
+msgstr "文件无法读取,可能是文件缺失。"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
+msgid "Currently no file uploaded."
+msgstr "目前没有文件上传。"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
+msgid "Mime"
+msgstr "Mime"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
+msgid "Actions"
+msgstr "动作"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
+msgid "This table displays all available attachments."
+msgstr "这个表显示所有可用的附件。"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
+msgid "empty"
+msgstr "空"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
+msgid "Create new attachment"
+msgstr "创建新附件"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
+msgid "New Attachment"
+msgstr "新附件"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
+msgid "This name is already in use."
+msgstr "该名称已经被使用。"
+
+#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
+msgid "Please specify a valid name for this attachment."
+msgstr "请为这个附件指定一个有效名称。"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:6
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:4
 #: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:34
-#: admin/systems/services/glpi/glpiPrinter.tpl:6
+#: admin/systems/services/glpi/glpi.tpl:6
 msgid "Generic"
 msgstr "通用配置"
 
-#: admin/systems/services/glpi/glpi.tpl:9
-msgid "System type"
-msgstr "系统类型"
+#: admin/systems/services/glpi/glpiPrinter.tpl:9
+msgid "Printer type"
+msgstr "打印机类型"
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:18
+#: admin/systems/services/glpi/glpiPrinter.tpl:32
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
 #: admin/systems/services/glpi/glpi.tpl:18
 #: admin/systems/services/glpi/glpi.tpl:32
 #: admin/systems/services/glpi/glpi.tpl:46
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:43
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:53
-#: admin/systems/services/glpi/glpiPrinter.tpl:18
-#: admin/systems/services/glpi/glpiPrinter.tpl:32
 msgid "edit"
 msgstr "编辑"
 
-#: admin/systems/services/glpi/glpi.tpl:23
-#: admin/systems/services/glpi/class_glpiAccount.inc:804
-msgid "Operating system"
-msgstr "操作系统"
-
-#: admin/systems/services/glpi/glpi.tpl:37
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpiPrinter.tpl:23
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
 #: admin/systems/services/glpi/glpi_devices.tpl:24
 #: admin/systems/services/glpi/glpi_devices.tpl:123
 #: admin/systems/services/glpi/glpi_devices.tpl:164
@@ -89,44 +191,125 @@ msgstr "操作系统"
 #: admin/systems/services/glpi/glpi_devices.tpl:633
 #: admin/systems/services/glpi/glpi_devices.tpl:687
 #: admin/systems/services/glpi/glpi_devices.tpl:733
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:47
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:812
+#: admin/systems/services/glpi/glpi.tpl:37
 #: admin/systems/services/glpi/class_glpiAccount.inc:809
-#: admin/systems/services/glpi/glpiPrinter.tpl:23
 msgid "Manufacturer"
 msgstr "生产商"
 
-#: admin/systems/services/glpi/glpi.tpl:52
+#: admin/systems/services/glpi/glpiPrinter.tpl:39
+msgid "Supported interfaces"
+msgstr "支持的界面"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:48
+msgid "Serial"
+msgstr "串行"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:58
+msgid "Parallel"
+msgstr "并行"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:68
+msgid "USB"
+msgstr "USB"
+
 #: admin/systems/services/glpi/glpiPrinter.tpl:80
+#: admin/systems/services/glpi/glpi.tpl:52
 msgid "Contacts"
 msgstr "联系"
 
-#: admin/systems/services/glpi/glpi.tpl:56
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
-#: admin/systems/services/glpi/class_glpiAccount.inc:806
-#: admin/systems/services/glpi/glpiPrinter.tpl:94
-msgid "Contact person"
-msgstr "联系人"
+#: admin/systems/services/glpi/glpiPrinter.tpl:83
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
+#: admin/systems/services/glpi/glpi.tpl:66
+#: admin/systems/services/glpi/class_glpiAccount.inc:802
+msgid "Technical responsible"
+msgstr "技术联系人"
 
+#: admin/systems/services/glpi/glpiPrinter.tpl:88
+#: admin/systems/services/glpi/glpiPrinter.tpl:99
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
 #: admin/systems/services/glpi/glpi.tpl:61
 #: admin/systems/services/glpi/glpi.tpl:71
 #: admin/systems/services/glpi/glpi.tpl:106
 #: admin/systems/services/glpi/glpiManufacturer.tpl:7
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:187
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:163
-#: admin/systems/services/glpi/glpiPrinter.tpl:88
-#: admin/systems/services/glpi/glpiPrinter.tpl:99
 msgid "Edit"
 msgstr "编辑"
 
-#: admin/systems/services/glpi/glpi.tpl:66
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:807
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:57
-#: admin/systems/services/glpi/class_glpiAccount.inc:802
-#: admin/systems/services/glpi/glpiPrinter.tpl:83
-msgid "Technical responsible"
-msgstr "技术联系人"
+#: admin/systems/services/glpi/glpiPrinter.tpl:94
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:810
+#: admin/systems/services/glpi/glpi.tpl:56
+#: admin/systems/services/glpi/class_glpiAccount.inc:806
+msgid "Contact person"
+msgstr "联系人"
 
-#: admin/systems/services/glpi/glpi.tpl:79
+#: admin/systems/services/glpi/glpiPrinter.tpl:107
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
+#: admin/systems/services/glpi/glpi.tpl:117
+#: admin/systems/services/glpi/class_glpiAccount.inc:810
+msgid "Attachments"
+msgstr "附加"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:127
+#: admin/systems/services/glpi/glpiSelectUser.tpl:20
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:20
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:20
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:20
+msgid "Information"
+msgstr "提示信息"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:139
+msgid "Installed cartridges"
+msgstr "安装的硒鼓"
+
+#: admin/systems/services/glpi/glpiPrinter.tpl:152
+#: admin/systems/services/glpi/glpiManufacturer.tpl:8
+msgid "Remove"
+msgstr "删除"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:1
+msgid "Manage System-types"
+msgstr "管理系统类型"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:9
+#: admin/systems/services/glpi/glpi_edit_type.tpl:28
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
+#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
+#: admin/systems/services/glpi/glpi_edit_os.tpl:9
+#: admin/systems/services/glpi/glpi_edit_os.tpl:28
+msgid "Rename"
+msgstr "重命名"
+
+#: admin/systems/services/glpi/glpi_edit_type.tpl:24
+#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
+#: admin/systems/services/glpi/glpi_edit_os.tpl:24
+msgid "Please enter a new name"
+msgstr "请输入一个新名称"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
+msgid "Can't delete this entry, it is still in use."
+msgstr "无法删除条目,仍在使用。"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
+#: admin/systems/services/glpi/class_glpiAccount.inc:656
+#: admin/systems/services/glpi/class_glpiAccount.inc:671
+msgid "N/A"
+msgstr "N/A"
+
+#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
+msgid "The selected name is already in use."
+msgstr "选择的名称已经被使用。"
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
+msgstr "附件"
+
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
 #: admin/systems/services/glpi/glpi_devices.tpl:112
 #: admin/systems/services/glpi/glpi_devices.tpl:153
 #: admin/systems/services/glpi/glpi_devices.tpl:208
@@ -139,201 +322,158 @@ msgstr "技术联系人"
 #: admin/systems/services/glpi/glpi_devices.tpl:622
 #: admin/systems/services/glpi/glpi_devices.tpl:676
 #: admin/systems/services/glpi/glpi_devices.tpl:722
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:25
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:18
+#: admin/systems/services/glpi/glpi.tpl:79
 #: admin/systems/services/glpi/class_glpiAccount.inc:803
 msgid "Comment"
 msgstr "注释"
 
-#: admin/systems/services/glpi/glpi.tpl:96
-msgid "Installed devices"
-msgstr "安装设备"
-
-#: admin/systems/services/glpi/glpi.tpl:112
-msgid "Trading"
-msgstr ""
-
-#: admin/systems/services/glpi/glpi.tpl:113
-msgid "Software"
-msgstr "软件"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
+msgid "File"
+msgstr "文件"
 
-#: admin/systems/services/glpi/glpi.tpl:114
-msgid "Contracts"
-msgstr "联系"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
+msgid "Upload"
+msgstr "上传"
 
-#: admin/systems/services/glpi/glpi.tpl:117
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:814
-#: admin/systems/services/glpi/class_glpiAccount.inc:810
-#: admin/systems/services/glpi/glpiPrinter.tpl:107
-msgid "Attachments"
-msgstr "附加"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
+msgid "Status"
+msgstr "状态"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
-#: admin/systems/services/glpi/class_glpiAccount.inc:146
-msgid "There is no server with valid glpi database service."
-msgstr "没有一个具有有效 glpi 数据库服务的服务器。"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
+msgid "Filename"
+msgstr "文件名"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
-#: admin/systems/services/glpi/class_glpiAccount.inc:156
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
-msgstr "无法连接到 glpi 数据库,没有安装 php-mysql 扩展。"
+#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
+msgstr "Mime-type"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
-#: admin/systems/services/glpi/class_glpiAccount.inc:166
-msgid "Can't connect to glpi database, check configuration twice."
-msgstr "无法连接到 glpi 数据库,再次检查配置文件。"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
+#, fuzzy
+msgid "cartridge"
+msgstr "硒鼓"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
-#: admin/systems/services/glpi/class_glpiAccount.inc:181
-msgid "Download of attachment failed. Attachment was not found on server."
-msgstr ""
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
+#, php-format
+msgid ""
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
+msgstr "您不能删除这个硒鼓类型,它仍然在被这个打印机 '%s' 使用。"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
-#: admin/systems/services/glpi/class_glpiAccount.inc:184
-msgid "Download of attachment failed. Not a valid attachment id."
-msgstr ""
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
+msgid "Cartridges"
+msgstr "硒鼓"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
-#: admin/systems/services/glpi/class_glpiAccount.inc:593
-msgid "Remove inventory"
-msgstr "删除 inventory"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
+msgid "Action"
+msgstr "行动"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
-msgstr "该服务器已经启用 inventory 功能。您可以点击下面按钮禁用。"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
+msgid "Delete"
+msgstr "删除"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
-#: admin/systems/services/glpi/class_glpiAccount.inc:596
-msgid "Add inventory"
-msgstr "æ·»å\8a æ¸\85å\8d\95(inventory)"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
+msgid "New monitor"
+msgstr "æ\96°ç\9b\91è§\86å\99¨"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
-msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
-msgstr "该服务器已经禁用 inventory 功能。您可以点击下面按钮启用。"
+#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
+#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
+msgid "M"
+msgstr "M"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
 #, php-format
 msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
-msgstr "æ\97 æ³\95å°\86ç»\99å\87ºç\9a\84æ\89\93å\8d°æ\9cºç±»å\9e\8bé\87\8då\91½å\90\8d为 '%s'ï¼\8cå\9b ä¸ºè¿\99个类å\9e\8bå\90\8d称已ç»\8få­\98å\9c¨ã\80\82"
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr "æ\82¨ä¸\8dè\83½å\88 é\99¤è¿\99个å\88¶é\80 å\95\86ï¼\8cå®\83ä»\8dç\84¶è¢«è¿\99äº\9bç³»ç»\9f使ç\94¨ '%s'"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
-msgstr "您不能删除这个打印机类型,它仍然在被 '%s' 使用。"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
+msgid "Please specify a name."
+msgstr "请输入一个名字。"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:633
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:648
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:268
-#: admin/systems/services/glpi/class_glpiAccount.inc:656
-#: admin/systems/services/glpi/class_glpiAccount.inc:671
-msgid "N/A"
-msgstr "N/A"
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
+#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
+msgid "Specified name is already in use, please choose another one."
+msgstr "提供的名称已经被使用,请选择另外一个。"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
-msgid "since"
-msgstr "自从"
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
+msgstr "参考"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
-#: admin/systems/services/glpi/class_glpiAccount.inc:793
-msgid "Glpi"
-msgstr ""
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
+#: admin/systems/services/glpi/glpi_devices.tpl:427
+#: admin/systems/services/glpi/glpi_devices.tpl:492
+#: admin/systems/services/glpi/glpi_devices.tpl:542
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
+#: admin/systems/services/glpi/class_glpiAccount.inc:808
+msgid "Type"
+msgstr "类型"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
+#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
+msgid "Choose"
+msgstr "选择"
+
+#: admin/systems/services/glpi/class_goGlpiServer.inc:32
+#: admin/systems/services/glpi/class_goGlpiServer.inc:87
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
 #, fuzzy
-msgid "Printer inventory extension"
-msgstr "添加打印机扩展"
+msgid "Inventory database"
+msgstr "用户数据库"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
+#: admin/systems/services/glpi/class_goGlpiServer.inc:58
 #, fuzzy
-msgid "Supports serial interface"
-msgstr "支持的界面"
+msgid "Inventory database service"
+msgstr "存货编号"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
+#: admin/systems/services/glpi/class_goGlpiServer.inc:67
 #, fuzzy
-msgid "Supports parallel interface"
-msgstr "支持的界面"
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "属性 '%s' 为空或者包含无效字符。"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
+#: admin/systems/services/glpi/class_goGlpiServer.inc:70
 #, fuzzy
-msgid "Supports usb interface"
-msgstr "支持的界面"
+msgid "The attribute database is empty or contains invalid characters."
+msgstr "属性 '%s' 为空或者包含无效字符。"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:808
-#: admin/systems/services/glpi/glpi_devices.tpl:17
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:53
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:22
-msgid "Comments"
-msgstr "注释"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:88
+msgid "Services"
+msgstr "服务"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
-#: admin/systems/services/glpi/class_glpiAccount.inc:805
-msgid "Location"
-msgstr "位置"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:96
+#, fuzzy
+msgid "Start"
+msgstr "启动"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:811
-#: admin/systems/services/glpi/glpi_devices.tpl:427
-#: admin/systems/services/glpi/glpi_devices.tpl:492
-#: admin/systems/services/glpi/glpi_devices.tpl:542
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:37
-#: admin/systems/services/glpi/class_glpiAccount.inc:808
-msgid "Type"
-msgstr "类型"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:97
+msgid "Stop"
+msgstr "停止"
 
-#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
+#: admin/systems/services/glpi/class_goGlpiServer.inc:98
 #, fuzzy
-msgid "Cartridge settings"
-msgstr "硒鼓"
+msgid "Restart"
+msgstr "重试"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:2
-msgid "Warning"
-msgstr "警告"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:100
+#, fuzzy
+msgid "Admin"
+msgstr "管理员"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr "请再次检查您是否要这么做,因为 GOsa 将没有办法将您的数据找回。"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:101
+#: admin/systems/services/glpi/goGlpiServer.tpl:20
+msgid "Database"
+msgstr "数据库"
 
-#: admin/systems/services/glpi/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"最好在执行这个操作之前,保存当前 MySQL 数据库中的内容到一个文件。所以,如果您"
-"已经这么做了,按“删除”继续或者按“取消”退出。"
+#: admin/systems/services/glpi/class_goGlpiServer.inc:102
+#: admin/systems/services/glpi/goGlpiServer.tpl:12
+msgid "Password"
+msgstr "口令"
 
 #: admin/systems/services/glpi/glpi_devices.tpl:2
 msgid "Add/Edit monitor"
 msgstr "添加/修改 显示器"
 
-#: admin/systems/services/glpi/glpi_devices.tpl:10
-#: admin/systems/services/glpi/glpi_devices.tpl:105
-#: admin/systems/services/glpi/glpi_devices.tpl:146
-#: admin/systems/services/glpi/glpi_devices.tpl:201
-#: admin/systems/services/glpi/glpi_devices.tpl:257
-#: admin/systems/services/glpi/glpi_devices.tpl:315
-#: admin/systems/services/glpi/glpi_devices.tpl:379
-#: admin/systems/services/glpi/glpi_devices.tpl:451
-#: admin/systems/services/glpi/glpi_devices.tpl:515
-#: admin/systems/services/glpi/glpi_devices.tpl:562
-#: admin/systems/services/glpi/glpi_devices.tpl:615
-#: admin/systems/services/glpi/glpi_devices.tpl:669
-#: admin/systems/services/glpi/glpi_devices.tpl:715
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:7
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:7
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:10
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:197
-msgid "Name"
-msgstr "名称"
-
 #: admin/systems/services/glpi/glpi_devices.tpl:33
 msgid "Monitor size"
 msgstr "显示器大小"
@@ -475,91 +615,32 @@ msgid "Bandwidth"
 msgstr "带宽"
 
 #: admin/systems/services/glpi/glpi_devices.tpl:607
-msgid "Add/Edit processor"
-msgstr "添加/修改 处理器"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:642
-msgid "Frequence"
-msgstr "频率"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:649
-msgid "Default frequence"
-msgstr "缺省频率"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:661
-msgid "Add/Edit motherboard"
-msgstr "添加/修改 主板"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:696
-msgid "Chipset"
-msgstr "芯片组"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:707
-msgid "Add/Edit computer case"
-msgstr "添加/修改 机箱"
-
-#: admin/systems/services/glpi/glpi_devices.tpl:742
-msgid "format"
-msgstr "格式"
-
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:7
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:8
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:29
-#: admin/systems/services/glpi/glpi_edit_os.tpl:9
-#: admin/systems/services/glpi/glpi_edit_os.tpl:28
-#: admin/systems/services/glpi/glpi_edit_type.tpl:9
-#: admin/systems/services/glpi/glpi_edit_type.tpl:28
-msgid "Rename"
-msgstr "重命名"
-
-#: admin/systems/services/glpi/glpi_edit_cartridge_type.tpl:13
-#: admin/systems/services/glpi/glpiManufacturer.tpl:13
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:14
-#: admin/systems/services/glpi/glpi_edit_os.tpl:15
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:81
-#: admin/systems/services/glpi/glpi_edit_type.tpl:15
-msgid "Close"
-msgstr "关闭"
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:1
-msgid "Manage manufacturers"
-msgstr "管理生产商"
-
-#: admin/systems/services/glpi/glpiManufacturer.tpl:8
-#: admin/systems/services/glpi/glpiPrinter.tpl:152
-msgid "Remove"
-msgstr "删除"
+msgid "Add/Edit processor"
+msgstr "添加/修改 处理器"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
-msgid "List of devices"
-msgstr "设备列表"
+#: admin/systems/services/glpi/glpi_devices.tpl:642
+msgid "Frequence"
+msgstr "频率"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
-msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
-msgstr "这个对话框允许您为您当前编辑的计算机添加一个设备。"
+#: admin/systems/services/glpi/glpi_devices.tpl:649
+msgid "Default frequence"
+msgstr "缺省频率"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
-msgid "Display devices matching"
-msgstr "æ\98¾ç¤ºå\8c¹é\85\8dç\9a\84设å¤\87"
+#: admin/systems/services/glpi/glpi_devices.tpl:661
+msgid "Add/Edit motherboard"
+msgstr "æ·»å\8a /ä¿®æ\94¹ ä¸»æ\9d¿"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
-msgid "Regular expression for matching device names"
-msgstr "匹配设备名的正则表达式"
+#: admin/systems/services/glpi/glpi_devices.tpl:696
+msgid "Chipset"
+msgstr "芯片组"
 
-#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
-#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
-#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
-msgid "Use"
-msgstr "使用"
+#: admin/systems/services/glpi/glpi_devices.tpl:707
+msgid "Add/Edit computer case"
+msgstr "添加/修改 机箱"
 
-#: admin/systems/services/glpi/glpi_edit_printer_type.tpl:25
-#: admin/systems/services/glpi/glpi_edit_os.tpl:24
-#: admin/systems/services/glpi/glpi_edit_type.tpl:24
-msgid "Please enter a new name"
-msgstr "请输入一个新名称"
+#: admin/systems/services/glpi/glpi_devices.tpl:742
+msgid "format"
+msgstr "格式"
 
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:88
 #, php-format
@@ -586,26 +667,6 @@ msgstr "您不能删除这个设备,它仍然被这些系统使用 '%s'"
 msgid "devices"
 msgstr "设备"
 
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:184
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:199
-msgid "Actions"
-msgstr "动作"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:188
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:164
-msgid "Delete"
-msgstr "删除"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-msgid "New monitor"
-msgstr "新监视器"
-
-#: admin/systems/services/glpi/class_glpiDeviceManagement.inc:221
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:206
-msgid "M"
-msgstr "M"
-
 #: admin/systems/services/glpi/class_glpiDeviceManagement.inc:223
 msgid "New mainbord"
 msgstr "新主板"
@@ -723,68 +784,55 @@ msgstr "无"
 msgid "Other"
 msgstr "其他"
 
-#: admin/systems/services/glpi/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
-msgstr "管理操作系统类型"
-
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:1
-msgid "Add/Edit manufacturer"
-msgstr "添加/修改 生产商"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:6
+msgid "List of users"
+msgstr "用户列表"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:14
-msgid "Website"
-msgstr "网站"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
+msgstr "这个对话框允许您选择一个用户作为技术负责人。"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:21
-msgid "Address"
-msgstr "住址"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:27
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:27
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:27
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:27
+msgid "Filters"
+msgstr "过滤器"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:32
-msgid "Phone number"
-msgstr "电话号码"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:35
+msgid "Display users matching"
+msgstr "显示匹配的用户"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:39
-msgid "Fax"
-msgstr "传真"
+#: admin/systems/services/glpi/glpiSelectUser.tpl:37
+msgid "Regular expression for matching user names"
+msgstr "匹配用户名的正则表达式"
 
-#: admin/systems/services/glpi/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr "é\82®ä»¶"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
+msgstr "é\99\84件å\88\97表"
 
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:53
-#, php-format
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
-msgstr "您不能删除这个制造商,它仍然被这些系统使用 '%s'"
-
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:99
-msgid "Please specify a name."
-msgstr "请输入一个名字。"
-
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:108
-#: admin/systems/services/glpi/class_glpiManufacturer.inc:114
-msgid "Specified name is already in use, please choose another one."
-msgstr "提供的名称已经被使用,请选择另外一个。"
-
-#: admin/systems/services/glpi/goGlpiServer.tpl:1
-#, fuzzy
-msgid "GLPI database information"
-msgstr "用户一般信息"
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
+msgstr "此对话框允许您附加额外的对象(如手册,说明书等)到您正编辑的计算机。"
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:4
-msgid "Logging DB user"
-msgstr "Logging DB 用户"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
+msgid "Display attachments matching"
+msgstr "显示匹配的附件"
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:12
-#: admin/systems/services/glpi/class_goGlpiServer.inc:102
-msgid "Password"
-msgstr "口令"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
+msgid "Regular expression for matching attachment names"
+msgstr "匹配附件名称的正则表达式"
 
-#: admin/systems/services/glpi/goGlpiServer.tpl:20
-#: admin/systems/services/glpi/class_goGlpiServer.inc:101
-msgid "Database"
-msgstr "数据库"
+#: admin/systems/services/glpi/glpiAttachmentPool.tpl:51
+#: admin/systems/services/glpi/glpiPrinterCartridges.tpl:51
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:109
+#: admin/systems/services/glpi/class_glpiSelectUser.inc:136
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:51
+msgid "Use"
+msgstr "使用"
 
 #: admin/systems/services/glpi/glpiPrinterCartridges.tpl:6
 msgid "List of available cartridge type for this type of printer"
@@ -810,69 +858,165 @@ msgstr "显示匹配的硒鼓类型"
 msgid "Regular expression for matching cartridge types"
 msgstr "匹配硒鼓类型的正则表达式"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:92
+#: admin/systems/services/glpi/goGlpiServer.tpl:1
 #, fuzzy
-msgid "cartridge"
-msgstr "ç¡\92é¼\93"
+msgid "GLPI database information"
+msgstr "ç\94¨æ\88·ä¸\80è\88¬ä¿¡æ\81¯"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:111
+#: admin/systems/services/glpi/goGlpiServer.tpl:4
+msgid "Logging DB user"
+msgstr "Logging DB 用户"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:163
+#: admin/systems/services/glpi/class_glpiAccount.inc:146
+msgid "There is no server with valid glpi database service."
+msgstr "没有一个具有有效 glpi 数据库服务的服务器。"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:173
+#: admin/systems/services/glpi/class_glpiAccount.inc:156
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr "无法连接到 glpi 数据库,没有安装 php-mysql 扩展。"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:183
+#: admin/systems/services/glpi/class_glpiAccount.inc:166
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr "无法连接到 glpi 数据库,再次检查配置文件。"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:198
+#: admin/systems/services/glpi/class_glpiAccount.inc:181
+msgid "Download of attachment failed. Attachment was not found on server."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:201
+#: admin/systems/services/glpi/class_glpiAccount.inc:184
+msgid "Download of attachment failed. Not a valid attachment id."
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:229
+#: admin/systems/services/glpi/class_glpiAccount.inc:593
+msgid "Remove inventory"
+msgstr "删除 inventory"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:230
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
+msgstr "该服务器已经启用 inventory 功能。您可以点击下面按钮禁用。"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:232
+#: admin/systems/services/glpi/class_glpiAccount.inc:596
+msgid "Add inventory"
+msgstr "添加清单(inventory)"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:233
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr "该服务器已经禁用 inventory 功能。您可以点击下面按钮启用。"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:256
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:294
 #, php-format
 msgid ""
-"You can't delete this cartridge type, it is still in use by this printer(s) "
-"'%s'."
-msgstr "您不能删除这个硒鼓类型,它仍然在被这个打印机 '%s' 使用。"
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
+msgstr "无法将给出的打印机类型重命名为 '%s',因为这个类型名称已经存在。"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:308
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr "您不能删除这个打印机类型,它仍然在被 '%s' 使用。"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:785
+msgid "since"
+msgstr "自从"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:795
+#: admin/systems/services/glpi/class_glpiAccount.inc:793
+msgid "Glpi"
+msgstr ""
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:796
+#, fuzzy
+msgid "Printer inventory extension"
+msgstr "添加打印机扩展"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:804
+#, fuzzy
+msgid "Supports serial interface"
+msgstr "支持的界面"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:805
+#, fuzzy
+msgid "Supports parallel interface"
+msgstr "支持的界面"
+
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:806
+#, fuzzy
+msgid "Supports usb interface"
+msgstr "支持的界面"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
-msgid "Cartridges"
-msgstr "硒鼓"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:809
+#: admin/systems/services/glpi/class_glpiAccount.inc:805
+msgid "Location"
+msgstr "位置"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:159
-msgid "Action"
-msgstr "行动"
+#: admin/systems/services/glpi/class_glpiPrinterAccount.inc:816
+#, fuzzy
+msgid "Cartridge settings"
+msgstr "硒鼓"
 
-#: admin/systems/services/glpi/glpi_edit_type.tpl:1
-msgid "Manage System-types"
-msgstr "管ç\90\86ç³»ç»\9fç±»å\9e\8b"
+#: admin/systems/services/glpi/glpi.tpl:9
+msgid "System type"
+msgstr "系统类型"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:104
-msgid "Can't delete this entry, it is still in use."
-msgstr "无法删除条目,仍在使用。"
+#: admin/systems/services/glpi/glpi.tpl:23
+#: admin/systems/services/glpi/class_glpiAccount.inc:804
+msgid "Operating system"
+msgstr "操作系统"
 
-#: admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc:286
-msgid "The selected name is already in use."
-msgstr "选择的名称已经被使用。"
+#: admin/systems/services/glpi/glpi.tpl:96
+msgid "Installed devices"
+msgstr "安装设备"
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:14
-msgid "Reference"
-msgstr "参考"
+#: admin/systems/services/glpi/glpi.tpl:112
+msgid "Trading"
+msgstr ""
 
-#: admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl:61
-msgid "Choose"
-msgstr "选择"
+#: admin/systems/services/glpi/glpi.tpl:113
+msgid "Software"
+msgstr "软件"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:2
-msgid "Attachment"
-msgstr "附件"
+#: admin/systems/services/glpi/glpi.tpl:114
+msgid "Contracts"
+msgstr "联系"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:30
-msgid "File"
-msgstr "文件"
+#: admin/systems/services/glpi/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
+msgstr "管理操作系统类型"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:33
-msgid "Upload"
-msgstr "上传"
+#: admin/systems/services/glpi/remove_glpi.tpl:2
+msgid "Warning"
+msgstr "警告"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:38
-msgid "Status"
-msgstr "状态"
+#: admin/systems/services/glpi/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr "请再次检查您是否要这么做,因为 GOsa 将没有办法将您的数据找回。"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:46
-msgid "Filename"
-msgstr "文件名"
+#: admin/systems/services/glpi/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"最好在执行这个操作之前,保存当前 MySQL 数据库中的内容到一个文件。所以,如果您"
+"已经这么做了,按“删除”继续或者按“取消”退出。"
 
-#: admin/systems/services/glpi/glpiAttachmentEdit.tpl:54
-msgid "Mime-type"
-msgstr "Mime-type"
+#: admin/systems/services/glpi/glpiManufacturer.tpl:1
+msgid "Manage manufacturers"
+msgstr "管理生产商"
 
 #: admin/systems/services/glpi/class_glpiAccount.inc:198
 #: admin/systems/services/glpi/class_glpiAccount.inc:204
@@ -947,48 +1091,6 @@ msgstr "模型"
 msgid "Peripheral devices"
 msgstr "打印设备"
 
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:6
-msgid "List of attachments"
-msgstr "附件列表"
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
-msgstr "此对话框允许您附加额外的对象(如手册,说明书等)到您正编辑的计算机。"
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:35
-msgid "Display attachments matching"
-msgstr "显示匹配的附件"
-
-#: admin/systems/services/glpi/glpiAttachmentPool.tpl:37
-msgid "Regular expression for matching attachment names"
-msgstr "匹配附件名称的正则表达式"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:9
-msgid "Printer type"
-msgstr "打印机类型"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:39
-msgid "Supported interfaces"
-msgstr "支持的界面"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:48
-msgid "Serial"
-msgstr "串行"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:58
-msgid "Parallel"
-msgstr "并行"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:68
-msgid "USB"
-msgstr "USB"
-
-#: admin/systems/services/glpi/glpiPrinter.tpl:139
-msgid "Installed cartridges"
-msgstr "安装的硒鼓"
-
 #: admin/systems/services/glpi/class_glpiSelectUser.inc:108
 msgid "Users"
 msgstr "用户"
@@ -1042,124 +1144,22 @@ msgstr "位置"
 msgid "Submit department"
 msgstr "提交部门"
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:68
-#, fuzzy
-msgid "attachment"
-msgstr "附件"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:6
+msgid "List of devices"
+msgstr "设备列表"
 
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:107
-#, php-format
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:23
 msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
-msgstr "您不能删除这个附件,它仍然被这些系统使用 '%s'"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
-msgid "There is no valid file uploaded."
-msgstr "没有上传有效文件。"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:126
-msgid "Upload wasn't successfull."
-msgstr "上传没有成功。"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:129
-#, php-format
-msgid "Missing directory '%s/glpi/' to store glpi uploads."
-msgstr "缺少目录 '%s/glpi/' 来保存 glpi 上传。"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:133
-msgid "There is already a file with the same name uploaded."
-msgstr "已经由同名文件上传。"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:137
-#, php-format
-msgid "Can't create file '%s'."
-msgstr "无法创建文件 '%s'。"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:181
-msgid "File is available."
-msgstr "文件可用。"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:183
-msgid "File is not readable, possibly the file is missing."
-msgstr "文件无法读取,可能是文件缺失。"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:186
-msgid "Currently no file uploaded."
-msgstr "目前没有文件上传。"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:198
-msgid "Mime"
-msgstr "Mime"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:201
-msgid "This table displays all available attachments."
-msgstr "这个表显示所有可用的附件。"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:218
-msgid "empty"
-msgstr "空"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:255
-msgid "Create new attachment"
-msgstr "创建新附件"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:256
-msgid "New Attachment"
-msgstr "新附件"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:349
-msgid "This name is already in use."
-msgstr "该名称已经被使用。"
-
-#: admin/systems/services/glpi/class_glpiAttachmentPool.inc:352
-msgid "Please specify a valid name for this attachment."
-msgstr "请为这个附件指定一个有效名称。"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:32
-#: admin/systems/services/glpi/class_goGlpiServer.inc:87
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-#, fuzzy
-msgid "Inventory database"
-msgstr "用户数据库"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:58
-#, fuzzy
-msgid "Inventory database service"
-msgstr "存货编号"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:67
-#, fuzzy
-msgid "The attribute user is empty or contains invalid characters."
-msgstr "属性 '%s' 为空或者包含无效字符。"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:70
-#, fuzzy
-msgid "The attribute database is empty or contains invalid characters."
-msgstr "属性 '%s' 为空或者包含无效字符。"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:88
-msgid "Services"
-msgstr "服务"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:96
-#, fuzzy
-msgid "Start"
-msgstr "启动"
-
-#: admin/systems/services/glpi/class_goGlpiServer.inc:97
-msgid "Stop"
-msgstr "停止"
+"This dialog allows you to attach a device to your currently edited computer."
+msgstr "这个对话框允许您为您当前编辑的计算机添加一个设备。"
 
-#: admin/systems/services/glpi/class_goGlpiServer.inc:98
-#, fuzzy
-msgid "Restart"
-msgstr "重试"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:35
+msgid "Display devices matching"
+msgstr "显示匹配的设备"
 
-#: admin/systems/services/glpi/class_goGlpiServer.inc:100
-#, fuzzy
-msgid "Admin"
-msgstr "管理员"
+#: admin/systems/services/glpi/glpiDeviceManagement.tpl:37
+msgid "Regular expression for matching device names"
+msgstr "匹配设备名的正则表达式"
 
 #~ msgid "You're about to delete the glpi attachment component '%s'."
 #~ msgstr "您将要删除 glpi 附件组件 '%s'。"