Updated locales

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

diff --git a/gosa-core/locale/core/de/LC_MESSAGES/messages.po b/gosa-core/locale/core/de/LC_MESSAGES/messages.po
index ede817e5838e3fc60d431db92eb0a2a0fbe03b12..bae034c301a35661958058e9c664193cc4eb1809 100644 (file)
--- a/gosa-core/locale/core/de/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-01 15:07+0100\n"
+"POT-Creation-Date: 2010-12-01 16:21+0100\n"
 "PO-Revision-Date: 2010-11-24 16:25+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -30,7 +30,6 @@ msgstr ""
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml:21
 #: plugins/admin/groups/group-filter.xml:17
 #: plugins/admin/departments/dep-filter.xml:17
-#: plugins/admin/newConfigManagement/DeviceConfig-filter.xml:14
 #: plugins/admin/ogroups/ogroup-filter.xml:18
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.xml:32
 #: plugins/personal/posix/trustSelect/trust-filter.xml:17
@@ -112,7 +111,6 @@ msgstr "Rolle"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:34
 #: plugins/admin/ogroups/ogroup-list.xml:41
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
 #: plugins/admin/ogroups/class_ogroup.inc:157
@@ -168,7 +166,6 @@ msgstr "Name"
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:63
 #: plugins/admin/departments/class_domain.inc:91
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:42
 #: plugins/admin/ogroups/ogroup-list.xml:49
 #: plugins/admin/ogroups/generic.tpl:15
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
@@ -193,7 +190,6 @@ msgstr "Beschreibung"
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/users/user-list.xml:78
 #: plugins/admin/groups/group-list.xml:62
 #: plugins/admin/departments/dep-list.xml:87
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:50
 #: plugins/admin/ogroups/ogroup-list.xml:62
 #: plugins/addons/propertyEditor/property-list.xml:96
 #: include/class_listing.inc:1183
@@ -213,7 +209,6 @@ msgstr "Anlegen"
 #: plugins/admin/groups/group-list.xml:98
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:64
 #: plugins/admin/ogroups/ogroup-list.xml:98
 #: plugins/personal/generic/generic_certs.tpl:22
 #: plugins/personal/generic/generic_certs.tpl:48
@@ -361,8 +356,6 @@ msgstr ""
 #: plugins/admin/groups/class_group.inc:758
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:94
 #: plugins/admin/ogroups/class_ogroup.inc:402
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:429
@@ -579,7 +572,7 @@ msgstr "Vorlage"
 #: plugins/personal/generic/class_user.inc:1703
 #: plugins/personal/generic/class_user.inc:1857
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:15
+#: ihtml/themes/default/infoPage.tpl:19
 msgid "Given name"
 msgstr "Vorname"
 
@@ -638,7 +631,7 @@ msgstr "UNIX-Einstellungen bearbeiten"
 #: plugins/admin/groups/class_groupManagement.inc:165
 #: plugins/admin/ogroups/tabs_ogroups.inc:155
 #: plugins/generic/infoPage/class_infoPage.inc:112
-#: ihtml/themes/default/infoPage.tpl:20
+#: ihtml/themes/default/infoPage.tpl:24
 msgid "Mail"
 msgstr "Mail"
 
@@ -827,7 +820,7 @@ msgstr "Benutzer"
 #: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/generic/class_user.inc:1702
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:14
+#: ihtml/themes/default/infoPage.tpl:18
 msgid "Surname"
 msgstr "Nachname"
 
@@ -1406,7 +1399,7 @@ msgstr "Land"
 #: plugins/admin/departments/generic.tpl:95
 #: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/class_user.inc:1734
-#: ihtml/themes/default/infoPage.tpl:28
+#: ihtml/themes/default/infoPage.tpl:32
 msgid "Location"
 msgstr "Ort"
 
@@ -1473,6 +1466,7 @@ msgstr ""
 
 #: plugins/admin/departments/dep-filter.xml:35
 #: plugins/admin/departments/generic.tpl:4
+#: ihtml/themes/default/infoPage.tpl:31
 msgid "Organizational Unit"
 msgstr "Organisationseinheit"
 
@@ -1485,7 +1479,7 @@ msgstr "Organisationseinheit"
 #: plugins/admin/departments/class_departmentManagement.inc:241
 #: plugins/personal/generic/generic.tpl:298
 #: plugins/personal/generic/class_user.inc:1720 setup/setup_feedback.tpl:10
-#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:26
+#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:30
 msgid "Organization"
 msgstr "Organisation"
 
@@ -1614,61 +1608,6 @@ msgstr ""
 "scrollen und auf den 'Fortfahren'-Knopf drücken, um mit der "
 "Abteilungsverwaltung fort zu fahren."
 
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:10
-msgid "List of items"
-msgstr "Liste der Items"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:75
-msgid "Edit item"
-msgstr "Item bearbeiten"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:82
-msgid "Remove item"
-msgstr "Item entfernen"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:9
-msgid "Container"
-msgstr "Container"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:10
-msgid "Item"
-msgstr "Item"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:8
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:9
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:352
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:353
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:359
-msgid "Config management"
-msgstr "Konfigurationsverwaltung"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:95
-#, php-format
-msgid "Failed to load distributions, error was '%s'!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:262
-msgid "No selectable install methods returned!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:263
-#: setup/class_setup.inc:183
-msgid "Setup"
-msgstr "Einrichtung"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:278
-msgid "Distribution"
-msgstr "Distribution"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:284
-msgid "Release"
-msgstr "Release"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:290
-msgid "Component"
-msgstr "Komponente"
-
 #: plugins/admin/ogroups/paste_generic.tpl:1
 msgid "Paste object group"
 msgstr "Objektgruppe einfügen"
@@ -1678,11 +1617,10 @@ msgid "Please enter the new object group name"
 msgstr "Bitte geben Sie einen Namen für die neue Objektgruppe ein"
 
 #: plugins/admin/ogroups/paste_generic.tpl:16
-msgid ""
-"Warning: systems can only inherit from a "
-"single object group!"
+msgid "Warning: systems can only inherit from a single object group!"
 msgstr ""
-"Mitglieder kopieren. Warnung: Systeme können nur von einer einzelnen Gruppe erben!"
+"Mitglieder kopieren. Warnung: Systeme können nur von einer einzelnen Gruppe "
+"erben!"
 
 #: plugins/admin/ogroups/ogroup-list.xml:11
 msgid "List of object groups"
@@ -2046,7 +1984,7 @@ msgid "Shell"
 msgstr "Shell"
 
 #: plugins/personal/posix/class_posixAccount.inc:1310
-#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:13
+#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:17
 msgid "User ID"
 msgstr "Benutzer-ID"
 
@@ -2237,7 +2175,7 @@ msgid "Your password hash method will not be changed!"
 msgstr "Ihre Passwort-Hash-Methode wird nicht verändert!"
 
 #: plugins/personal/generic/paste_generic.tpl:1
-#: ihtml/themes/default/infoPage.tpl:44
+#: ihtml/themes/default/infoPage.tpl:48
 msgid "User settings"
 msgstr "Benutzer-Einstellungen"
 
@@ -2328,20 +2266,20 @@ msgstr "Name der Vorlage"
 
 #: plugins/personal/generic/generic.tpl:92
 #: plugins/personal/generic/class_user.inc:1708
-#: ihtml/themes/default/infoPage.tpl:16
+#: ihtml/themes/default/infoPage.tpl:20
 msgid "Personal title"
 msgstr "Titel"
 
 #: plugins/personal/generic/generic.tpl:102
 #: plugins/personal/generic/class_user.inc:1709
-#: ihtml/themes/default/infoPage.tpl:17
+#: ihtml/themes/default/infoPage.tpl:21
 msgid "Academic title"
 msgstr "Akademischer Titel"
 
 #: plugins/personal/generic/generic.tpl:117
 #: plugins/personal/generic/class_user.inc:1368
 #: plugins/personal/generic/class_user.inc:1711
-#: ihtml/themes/default/infoPage.tpl:19
+#: ihtml/themes/default/infoPage.tpl:23
 msgid "Date of birth"
 msgstr "Geburtsdatum"
 
@@ -2417,7 +2355,7 @@ msgstr "Angestellten-Nr."
 
 #: plugins/personal/generic/generic.tpl:330
 #: plugins/personal/generic/class_user.inc:1725
-#: ihtml/themes/default/infoPage.tpl:33
+#: ihtml/themes/default/infoPage.tpl:37
 msgid "Employee type"
 msgstr "Anstellungsart"
 
@@ -2470,7 +2408,7 @@ msgstr "Referat"
 
 #: plugins/personal/generic/generic.tpl:535
 #: plugins/personal/generic/class_user.inc:1665
-#: ihtml/themes/default/infoPage.tpl:29
+#: ihtml/themes/default/infoPage.tpl:33
 msgid "Street"
 msgstr "Straße"
 
@@ -2566,11 +2504,11 @@ msgstr "Die gewählte Passwort-Methode ist nicht mehr verfügbar."
 
 #: plugins/personal/generic/class_user.inc:1051
 msgid ""
-"Cannot save user picturer: GOsa requires the package 'imagemagick' or 'php5-"
+"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-"
 "imagick' to be installed!"
 msgstr ""
-"Das Benutzerbild kann nicht gespeichert werden: GOsa benötigt die Pakete 'imagemagick' "
-"oder 'php5-imagick'!"
+"Das Benutzerbild kann nicht gespeichert werden: GOsa benötigt die Pakete "
+"'imagemagick' oder 'php5-imagick'!"
 
 #: plugins/personal/generic/class_user.inc:1177
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
@@ -2612,12 +2550,12 @@ msgid "Login restrictions"
 msgstr "Anmeldungs-Einschränkungen"
 
 #: plugins/personal/generic/class_user.inc:1722
-#: ihtml/themes/default/infoPage.tpl:30
+#: ihtml/themes/default/infoPage.tpl:34
 msgid "Department number"
 msgstr "Abteilungsnummer"
 
 #: plugins/personal/generic/class_user.inc:1724
-#: ihtml/themes/default/infoPage.tpl:32
+#: ihtml/themes/default/infoPage.tpl:36
 msgid "Employee number"
 msgstr "Personalnummer"
 
@@ -2642,11 +2580,12 @@ msgid "Fax number"
 msgstr "Faxnummer"
 
 #: plugins/personal/generic/class_user.inc:1737
-#: ihtml/themes/default/infoPage.tpl:18
+#: ihtml/themes/default/infoPage.tpl:22
 msgid "Home postal address"
 msgstr "Private Adresse"
 
 #: plugins/personal/generic/class_user.inc:1738
+#: ihtml/themes/default/infoPage.tpl:25
 msgid "Home phone number"
 msgstr "Telefonnummer (privat)"
 
@@ -2879,6 +2818,7 @@ msgid "Migrate"
 msgstr "Migrieren"
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:204
+#, php-format
 msgid "Migration failed for object %s: DN already exists!"
 msgstr "Migration des Objektes %s ist fehlgeschlagen: DN existiert bereits!"
 
@@ -2995,7 +2935,7 @@ msgstr ""
 msgid "Dynamic object"
 msgstr "Dynamisches Objekt"
 
-#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:62
+#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:66
 msgid "The GOsa team"
 msgstr "Das GOsa Team"
 
@@ -4323,6 +4263,10 @@ msgstr ""
 "Die strukturelle Objekt-Typ Ihres Wurzel-Objektes kann nicht konvertiert "
 "werden. Bitte fügen Sie die Objekt-Klasse '%s' manuell hinzu."
 
+#: setup/class_setup.inc:183
+msgid "Setup"
+msgstr "Einrichtung"
+
 #: setup/class_setup.inc:195
 msgid "Completed"
 msgstr "Abgeschlossen"
@@ -4547,16 +4491,7 @@ msgstr "SSL Sitzung"
 msgid "User information"
 msgstr "Benutzer-Information"
 
-#: ihtml/themes/default/infoPage.tpl:21
-msgid "Home phone"
-msgstr "Telefonnummer (privat)"
-
-#: ihtml/themes/default/infoPage.tpl:27
-#, fuzzy
-msgid "Organizational unit"
-msgstr "Organisationseinheit"
-
-#: ihtml/themes/default/infoPage.tpl:51
+#: ihtml/themes/default/infoPage.tpl:55
 msgid "Administrative contact"
 msgstr "Kontakt zu Ihrem Administrator"
 
@@ -6151,11 +6086,12 @@ msgstr "Datenbankdatei für die GOsa Nutzungsstatistik."
 msgid ""
 "Enables event logging in GOsa. Setting it to 'On' make GOsa log every action "
 "a user performs via syslog. If you use this in combination with rsyslog and "
-"configure it to mysql logging, you can browse all events in GOsa."
+"configure it to MySQL logging, you can browse all events in GOsa."
 msgstr ""
 "Aktiviert die GOsa Ereignis-Protokollierung. Setzen Sie es auf 'An' um GOsa "
-"jede Nutzeraktion via Syslog protokollieren zu lassen. In Kombination mit dem "
-"rsyslog Plugin mit aktiviertem MySQL, können Sie diese Events in GOsa durchsuchen."
+"jede Nutzeraktion via Syslog protokollieren zu lassen. In Kombination mit "
+"dem rsyslog Plugin mit aktiviertem MySQL, können Sie diese Events in GOsa "
+"durchsuchen."
 
 #: include/class_core.inc:279
 msgid ""
@@ -6174,8 +6110,8 @@ msgid ""
 "Specify the minimum number of characters that have to differ between old and "
 "newly entered passwords."
 msgstr ""
-"Gibt die minimale Anzahl von Zeichen an, die sich zwischen neuem und altem Passwort "
-"unterscheiden müssen."
+"Gibt die minimale Anzahl von Zeichen an, die sich zwischen neuem und altem "
+"Passwort unterscheiden müssen."
 
 #: include/class_core.inc:309
 msgid ""
@@ -6197,6 +6133,7 @@ msgstr ""
 "dass sensible Daten angezeigt werden."
 
 #: include/class_core.inc:319
+#, php-format
 msgid "Related option"
 msgstr "Verwandte Einstellung"
 
@@ -6206,7 +6143,8 @@ msgid ""
 "may produce some ACL related false error messages!"
 msgstr ""
 "Anzeigen von Meldungen die bei der Plugin-Entwicklung hilfreich sein können. "
-"Achtung: diese Einstellung kann im Bezug auf ACLs fehlerhafte Meldungen erzeugen."
+"Achtung: diese Einstellung kann im Bezug auf ACLs fehlerhafte Meldungen "
+"erzeugen."
 
 #: include/class_core.inc:340
 msgid ""
@@ -6214,17 +6152,20 @@ msgid ""
 "'On' because it enables efficient methods to create missing subtrees in the "
 "LDAP."
 msgstr ""
-"Aktiviert LDAP-Schema-Prüfungen während der Anmeldung. Es wird empfohlen diese "
-"Einstellung zu aktivieren, da sie zusätzlich eine effektivere Methode zum "
-"Erzeugen von fehlenden Unterbäumen aktiviert."
+"Aktiviert LDAP-Schema-Prüfungen während der Anmeldung. Es wird empfohlen "
+"diese Einstellung zu aktivieren, da sie zusätzlich eine effektivere Methode "
+"zum Erzeugen von fehlenden Unterbäumen aktiviert."
 
 #: include/class_core.inc:350
 msgid "Enable copy and paste for most objects managed by GOsa."
-msgstr "Aktiviert Kopieren und Einfügen für die meisten von GOsa verwalteten Objekte."
+msgstr ""
+"Aktiviert Kopieren und Einfügen für die meisten von GOsa verwalteten Objekte."
 
 #: include/class_core.inc:360
 msgid "Enable PHP security checks for disabled register_global settings."
-msgstr "Aktiviert PHP-Sicherheitsprüfungen für deaktivierte register_global Einstellungen."
+msgstr ""
+"Aktiviert PHP-Sicherheitsprüfungen für deaktivierte register_global "
+"Einstellungen."
 
 #: include/class_core.inc:370
 msgid "Enable automatic redirection to HTTPS based administration."
@@ -6255,8 +6196,8 @@ msgid ""
 "Specify the maximum number of entries GOsa will request from an LDAP server. "
 "A warning is displayed if this limit is exceeded."
 msgstr ""
-"Gibt die maximale Anzahl von Einträgen an, die GOsa vom LDAP-Server anfordert. "
-"Bei Überschreitung wird eine Warnung angezeigt."
+"Gibt die maximale Anzahl von Einträgen an, die GOsa vom LDAP-Server "
+"anfordert. Bei Überschreitung wird eine Warnung angezeigt."
 
 #: include/class_core.inc:420
 msgid "Disable checks for LDAP size limits."
@@ -6287,7 +6228,8 @@ msgid ""
 "Number of seconds a LDAP query is allowed to take until GOsa aborts the "
 "request."
 msgstr ""
-"Anzahl der Sekunden, ab denen eine LDAP-Abfrage als gescheitert behandelt wird."
+"Anzahl der Sekunden, ab denen eine LDAP-Abfrage als gescheitert behandelt "
+"wird."
 
 #: include/class_core.inc:482
 msgid "Enables storing of user filters in browser cookies."
@@ -6299,7 +6241,8 @@ msgstr "Aktiviert Webseiten-Komprimierung."
 
 #: include/class_core.inc:503
 msgid "LDAP attribute which is used to detect changes."
-msgstr "LDAP-Attribut welches für das Feststellen von Änderungen verwendet wird."
+msgstr ""
+"LDAP-Attribut welches für das Feststellen von Änderungen verwendet wird."
 
 #: include/class_core.inc:514
 msgid ""
@@ -6316,9 +6259,9 @@ msgid ""
 "Number of seconds after an inactive session expires. This may be overridden "
 "by some systems php.ini/crontab mechanism."
 msgstr ""
-"Anzahl der Sekunden nach denen eine inaktive Sitzung abläuft. Dies kann "
-"bei einigen Systemen durch einen php.ini/crontab Machnismus ausser Kraft "
-"gesetzt werden."
+"Anzahl der Sekunden nach denen eine inaktive Sitzung abläuft. Dies kann bei "
+"einigen Systemen durch einen php.ini/crontab Machnismus ausser Kraft gesetzt "
+"werden."
 
 #: include/class_core.inc:545
 msgid "Template engine compile directory."
@@ -6330,8 +6273,8 @@ msgid ""
 "Logical AND of the integer values below that controls the debug output on "
 "every page load: %s"
 msgstr ""
-"Logische UND-Verknüpfung von integer-Werten die die Debug-Ausgaben auf "
-"jeder Seite steuern: %s"
+"Logische UND-Verknüpfung von integer-Werten die die Debug-Ausgaben auf jeder "
+"Seite steuern: %s"
 
 #: include/class_core.inc:576
 msgid ""
@@ -6357,8 +6300,8 @@ msgid ""
 "Specify whether 'cn' or 'uid' style user DNs are generated. For more "
 "sophisticated control use the 'accountRDN' setting."
 msgstr ""
-"Gibt an ob die Benutzer-DN im cn- oder uid-Stil generiert werden soll. "
-"Ist die Erzeugung komplizierter, nutzen Sie die 'accountRDN' Einstellung."
+"Gibt an ob die Benutzer-DN im cn- oder uid-Stil generiert werden soll. Ist "
+"die Erzeugung komplizierter, nutzen Sie die 'accountRDN' Einstellung."
 
 #: include/class_core.inc:617
 msgid "Location component for user storage inside of departments."
@@ -6373,49 +6316,45 @@ msgid ""
 "Count base for group IDs. For dynamic ID assignment use the 'nextIdHook' "
 "setting."
 msgstr ""
-"Zählbasis für Gruppen-IDs. Soll dies dynamisch erfolgen, nutzen Sie die "
-" 'nextIdHook' Einstellung."
+"Zählbasis für Gruppen-IDs. Soll dies dynamisch erfolgen, nutzen Sie die  "
+"'nextIdHook' Einstellung."
 
 #: include/class_core.inc:647
 msgid ""
 "Count base for user IDs. For dynamic ID assignment use the 'nextIdHook' "
 "setting."
 msgstr ""
-"Zählbasis für Benutzer-IDs. Soll dies dynamisch erfolgen, nutzen Sie die "
-" 'nextIdHook' Einstellung."
+"Zählbasis für Benutzer-IDs. Soll dies dynamisch erfolgen, nutzen Sie die  "
+"'nextIdHook' Einstellung."
 
 #: include/class_core.inc:657
 msgid ""
 "Lowest assignable group ID for use with the idAllocationMethod set to 'pool'."
-msgstr ""
-"Niedrigste zuweisbare Gruppen-Id, wenn idAllocationMethod 'pool' ist."
+msgstr "Niedrigste zuweisbare Gruppen-Id, wenn idAllocationMethod 'pool' ist."
 
 #: include/class_core.inc:667
 msgid ""
 "Highest assignable group ID for use with the idAllocationMethod set to "
 "'pool'."
-msgstr ""
-"Höchste zuweisbare Gruppen-Id, wenn idAllocationMethod 'pool' ist."
+msgstr "Höchste zuweisbare Gruppen-Id, wenn idAllocationMethod 'pool' ist."
 
 #: include/class_core.inc:677
 msgid ""
 "Lowest assignable user ID for use with the idAllocationMethod set to 'pool'."
-msgstr ""
-"Niedrigste zuweisbare Benutzer-Id, wenn idAllocationMethod 'pool' ist."
+msgstr "Niedrigste zuweisbare Benutzer-Id, wenn idAllocationMethod 'pool' ist."
 
 #: include/class_core.inc:687
 msgid ""
 "Highest assignable user ID for use with the idAllocationMethod set to 'pool'."
-msgstr ""
-"Höchste zuweisbare Benutzer-Id, wenn idAllocationMethod 'pool' ist."
+msgstr "Höchste zuweisbare Benutzer-Id, wenn idAllocationMethod 'pool' ist."
 
 #: include/class_core.inc:697
 msgid ""
 "Count base for user IDs. For dynamic ID assignment use the 'baseIdHook' "
 "setting."
 msgstr ""
-"Zählbasis für Benutzer-IDs. Soll dies dynamisch erfolgen, nutzen Sie die "
-" 'baseIdHook' Einstellung."
+"Zählbasis für Benutzer-IDs. Soll dies dynamisch erfolgen, nutzen Sie die  "
+"'baseIdHook' Einstellung."
 
 #: include/class_core.inc:707
 msgid "Connection URL for use with the gosa-ng service."
@@ -6435,7 +6374,9 @@ msgstr "Verbindungs URI für den gosa-si Dienst (abgekündigt)."
 
 #: include/class_core.inc:747
 msgid "Number of seconds after a gosa-si connection is considered 'dead'."
-msgstr "Anzahl der Sekunden nach denen eine gosa-si Verbindung als 'tot' betrachtet wird."
+msgstr ""
+"Anzahl der Sekunden nach denen eine gosa-si Verbindung als 'tot' betrachtet "
+"wird."
 
 #: include/class_core.inc:758
 msgid "User attribute which is used for log in."
@@ -6455,7 +6396,9 @@ msgstr ""
 
 #: include/class_core.inc:789
 msgid "Enable the use of {sasl} instead of {kerberos} for user realms."
-msgstr "Aktiviert die Verwendung von {sasl} anstelle von {kerberos} für Benutzer-Realms."
+msgstr ""
+"Aktiviert die Verwendung von {sasl} anstelle von {kerberos} für Benutzer-"
+"Realms."
 
 #: include/class_core.inc:799
 msgid ""
@@ -6475,15 +6418,17 @@ msgstr ""
 
 #: include/class_core.inc:819
 msgid "Script to be called for finding the next free id for groups or users."
-msgstr "Skript welches zum Auffinden der nächsten freien Gruppen- oder Benutzer-ID verwendet wird."
+msgstr ""
+"Skript welches zum Auffinden der nächsten freien Gruppen- oder Benutzer-ID "
+"verwendet wird."
 
 #: include/class_core.inc:828
 msgid ""
 "Descriptive string for the automatic ID generator. Please read the FAQ file "
 "for more information."
 msgstr ""
-"Beschreibende Zeichenkette für den automatischen ID-Generator. Nähere Angaben finden "
-"Sie in der FAQ."
+"Beschreibende Zeichenkette für den automatischen ID-Generator. Nähere "
+"Angaben finden Sie in der FAQ."
 
 #: include/class_core.inc:838
 msgid "Enable strict checking for user IDs and group names."
@@ -6510,18 +6455,19 @@ msgid ""
 "Namespace rule to create user folders. Please read the FAQ file for more "
 "information."
 msgstr ""
-"Regel zum erzeugen von Benutzer-Ordnern. Nähere Angaben finden Sie in der FAQ."
+"Regel zum erzeugen von Benutzer-Ordnern. Nähere Angaben finden Sie in der "
+"FAQ."
 
 #: include/class_core.inc:889
 msgid ""
 "Namespace rule to create folders. Please read the FAQ file for more "
 "information."
-msgstr ""
-"Regel zum erzeugen von Ordnern. Nähere Angaben finden Sie in der FAQ."
+msgstr "Regel zum erzeugen von Ordnern. Nähere Angaben finden Sie in der FAQ."
 
 #: include/class_core.inc:899
 msgid "Seconds after an IMAP connection is considered dead."
-msgstr "Anzahl der Sekunden nach denen eine IMAP-Verbindung als 'tot' behandelt wird."
+msgstr ""
+"Anzahl der Sekunden nach denen eine IMAP-Verbindung als 'tot' behandelt wird."
 
 #: include/class_core.inc:910
 msgid "Class name of the mail method to be used."
@@ -6538,7 +6484,8 @@ msgid ""
 "Directory to store vacation templates. Please read the FAQ file for more "
 "information."
 msgstr ""
-"Verzeichnis welches Urlaubs-Vorlagen enthält. Nähere Angaben finden Sie in der FAQ."
+"Verzeichnis welches Urlaubs-Vorlagen enthält. Nähere Angaben finden Sie in "
+"der FAQ."
 
 #: include/class_core.inc:940
 msgid "Enable TLS for LDAP connections."
@@ -6553,8 +6500,8 @@ msgid ""
 "Maintain sambaIdmapEntry objects to improve performance on some Samba "
 "versions."
 msgstr ""
-"Aktiviert die Verwaltung von sambaIdmapEntry Objekten um die "
-"Performance bei einigen Samba-Versionen zu erhöhen."
+"Aktiviert die Verwaltung von sambaIdmapEntry Objekten um die Performance bei "
+"einigen Samba-Versionen zu erhöhen."
 
 #: include/class_core.inc:970
 msgid "Enable checks to determine whether an account is expired or not."
@@ -6571,7 +6518,8 @@ msgid ""
 "String containing the RID base for Samba setups without the Domain object in "
 "LDAP."
 msgstr ""
-"Zeichenkette mit der RID-Basis von Samba-Einrichtungen ohne Domain-Objekt im LDAP."
+"Zeichenkette mit der RID-Basis von Samba-Einrichtungen ohne Domain-Objekt im "
+"LDAP."
 
 #: include/class_core.inc:1000
 msgid "Enable manual object snapshots."
@@ -6594,8 +6542,8 @@ msgid ""
 "Method for user and group ID generation. Note: only the 'traditional' method "
 "is safe due to PHP limitations."
 msgstr ""
-"Zu verwendende Methode für die Benutzer- und Gruppen-ID Generierung. Hinweis: "
-"nur 'traditional' ist aufgrund von Einschränkungen von PHP sicher."
+"Zu verwendende Methode für die Benutzer- und Gruppen-ID Generierung. "
+"Hinweis: nur 'traditional' ist aufgrund von Einschränkungen von PHP sicher."
 
 #: include/class_core.inc:1050
 msgid "URI of server to be used for snapshots."
@@ -6976,55 +6924,3 @@ msgstr ""
 #: include/class_pathNavigator.inc:86
 msgid "Welcome to GOsa"
 msgstr "Willkommen bei GOsa"
-
-#~ msgid ""
-#~ "The 'htaccessAuthentication' variable tells GOsa to use either htaccess "
-#~ "authentication or LDAP authentication. This can be used if you want to "
-#~ "use i.e. Kerberos to authenticate the users."
-#~ msgstr ""
-#~ "Die Option 'htaccessAuthentication' teilt GOsa mit eine LDAP-basierte "
-#~ "oder eine htaccess-Authentifizierung zu verwenden. Dies kann nützlich "
-#~ "sein wenn Sie beispielsweise über Kerberos authentifizieren möchten."
-
-#~ msgid "Here is an example command:"
-#~ msgstr "Hier ein Beispiel-Kommando:"
-
-#~ msgid "Max"
-#~ msgstr "Maximum"
-
-#~ msgid "Welcome %s!"
-#~ msgstr "Willkommen %s!"
-
-#~ msgid ""
-#~ "The 'ogroupRDN' statement defines the location where new object groups "
-#~ "will be created. The default is 'ou=groups,'."
-#~ msgstr ""
-#~ "Die 'ogroupRDN' Option definiert den Ablage-Container für neue Objekt-"
-#~ "Gruppen.Der Standard ist 'ou=groups,'."
-
-#~ msgid ""
-#~ "The 'aclRoleRDN' statement defines the location where new ACL roles will "
-#~ "be created. The default is 'ou=aclroles,'."
-#~ msgstr ""
-#~ "Die Option 'aclRoleRDN' definiert den Ablageort für neue ACL-Rollen. Der "
-#~ "Standard ist 'ou=aclroles,'."
-
-#~ msgid "FALSE"
-#~ msgstr "Aus"
-
-#~ msgid "TRUE"
-#~ msgstr "An"
-
-#~ msgid ""
-#~ "The 'accountRDN' option tells GOsa to use a placeholder pattern for "
-#~ "generating account RDNs. A pattern can include attribute names prefaced "
-#~ "by a %% and normal text: %s. This will generate a RDN consisting of "
-#~ "cn=.... filled with surname and given name of the edited account. This "
-#~ "option disables the use of accountPrimaryAttribute and personalTitleInDn."
-#~ msgstr ""
-#~ "Die Option 'accountRDN' teilt GOsa mit, wie eine Konto-RDN "
-#~ "zusammengesetzt werden soll. Das Vorgabemuster kann Attributnamen mit "
-#~ "vorangestelltem %% und normalen text enthalten: %s. Dies erstellt eine "
-#~ "RDN, bestehend aus cn=...., aufgeüfllt mit Nach- und Vornamen des "
-#~ "bearbeiteten Kontos. Diese Option deaktiviert die Nutzung von "
-#~ "accountPrimaryAttribute und personalTitleInDn."

diff --git a/gosa-core/locale/core/es/LC_MESSAGES/messages.po b/gosa-core/locale/core/es/LC_MESSAGES/messages.po
index 32c0e3c7799f91ec351f145bb829220a1b70f53d..f3af2d4484bf9b1b744d167c9d69e3a74ce4542e 100644 (file)
--- a/gosa-core/locale/core/es/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-01 15:07+0100\n"
+"POT-Creation-Date: 2010-12-01 16:21+0100\n"
 "PO-Revision-Date: 2010-01-28 23:21+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
@@ -25,7 +25,6 @@ msgstr ""
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml:21
 #: plugins/admin/groups/group-filter.xml:17
 #: plugins/admin/departments/dep-filter.xml:17
-#: plugins/admin/newConfigManagement/DeviceConfig-filter.xml:14
 #: plugins/admin/ogroups/ogroup-filter.xml:18
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.xml:32
 #: plugins/personal/posix/trustSelect/trust-filter.xml:17
@@ -109,7 +108,6 @@ msgstr "Rol"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:34
 #: plugins/admin/ogroups/ogroup-list.xml:41
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
 #: plugins/admin/ogroups/class_ogroup.inc:157
@@ -165,7 +163,6 @@ msgstr "Nombre"
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:63
 #: plugins/admin/departments/class_domain.inc:91
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:42
 #: plugins/admin/ogroups/ogroup-list.xml:49
 #: plugins/admin/ogroups/generic.tpl:15
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
@@ -190,7 +187,6 @@ msgstr "Descripción"
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/users/user-list.xml:78
 #: plugins/admin/groups/group-list.xml:62
 #: plugins/admin/departments/dep-list.xml:87
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:50
 #: plugins/admin/ogroups/ogroup-list.xml:62
 #: plugins/addons/propertyEditor/property-list.xml:96
 #: include/class_listing.inc:1183
@@ -210,7 +206,6 @@ msgstr "Crear"
 #: plugins/admin/groups/group-list.xml:98
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:64
 #: plugins/admin/ogroups/ogroup-list.xml:98
 #: plugins/personal/generic/generic_certs.tpl:22
 #: plugins/personal/generic/generic_certs.tpl:48
@@ -359,8 +354,6 @@ msgstr ""
 #: plugins/admin/groups/class_group.inc:758
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:94
 #: plugins/admin/ogroups/class_ogroup.inc:402
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:429
@@ -576,7 +569,7 @@ msgstr "Plantilla"
 #: plugins/personal/generic/class_user.inc:1703
 #: plugins/personal/generic/class_user.inc:1857
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:15
+#: ihtml/themes/default/infoPage.tpl:19
 msgid "Given name"
 msgstr "Nombre de pila"
 
@@ -635,7 +628,7 @@ msgstr "Editar características POSIX"
 #: plugins/admin/groups/class_groupManagement.inc:165
 #: plugins/admin/ogroups/tabs_ogroups.inc:155
 #: plugins/generic/infoPage/class_infoPage.inc:112
-#: ihtml/themes/default/infoPage.tpl:20
+#: ihtml/themes/default/infoPage.tpl:24
 msgid "Mail"
 msgstr "Correo Electrónico"
 
@@ -829,7 +822,7 @@ msgstr "Usuario"
 #: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/generic/class_user.inc:1702
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:14
+#: ihtml/themes/default/infoPage.tpl:18
 msgid "Surname"
 msgstr "Apellido"
 
@@ -1422,7 +1415,7 @@ msgstr "Provincia"
 #: plugins/admin/departments/generic.tpl:95
 #: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/class_user.inc:1734
-#: ihtml/themes/default/infoPage.tpl:28
+#: ihtml/themes/default/infoPage.tpl:32
 msgid "Location"
 msgstr "Localización"
 
@@ -1487,6 +1480,7 @@ msgstr ""
 
 #: plugins/admin/departments/dep-filter.xml:35
 #: plugins/admin/departments/generic.tpl:4
+#: ihtml/themes/default/infoPage.tpl:31
 #, fuzzy
 msgid "Organizational Unit"
 msgstr "Nombre de la Organización"
@@ -1500,7 +1494,7 @@ msgstr "Nombre de la Organización"
 #: plugins/admin/departments/class_departmentManagement.inc:241
 #: plugins/personal/generic/generic.tpl:298
 #: plugins/personal/generic/class_user.inc:1720 setup/setup_feedback.tpl:10
-#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:26
+#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:30
 msgid "Organization"
 msgstr "Organización"
 
@@ -1630,68 +1624,6 @@ msgstr ""
 "final de la página y presionar el botón 'Continuar' para continuar al "
 "dialogo de gestión de departamento."
 
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:10
-#, fuzzy
-msgid "List of items"
-msgstr "Lista de usuarios"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:75
-#, fuzzy
-msgid "Edit item"
-msgstr "Editar certificados"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:82
-#, fuzzy
-msgid "Remove item"
-msgstr "Eliminar foto"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:9
-#, fuzzy
-msgid "Container"
-msgstr "Continuar"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:10
-msgid "Item"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:8
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:9
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:352
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:353
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:359
-#, fuzzy
-msgid "Config management"
-msgstr "Sistemas-/Administración de Configuraciones"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:95
-#, php-format
-msgid "Failed to load distributions, error was '%s'!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:262
-msgid "No selectable install methods returned!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:263
-#: setup/class_setup.inc:183
-msgid "Setup"
-msgstr "Configuración"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:278
-#, fuzzy
-msgid "Distribution"
-msgstr "Descripción"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:284
-msgid "Release"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:290
-#, fuzzy
-msgid "Component"
-msgstr "Componentes del dominio"
-
 #: plugins/admin/ogroups/paste_generic.tpl:1
 #, fuzzy
 msgid "Paste object group"
@@ -1702,9 +1634,7 @@ msgid "Please enter the new object group name"
 msgstr "Por favor introduzca un nuevo nombre del grupo de objetos"
 
 #: plugins/admin/ogroups/paste_generic.tpl:16
-msgid ""
-"Copy members. Be careful with this option, systems can only inherit from a "
-"single object group!"
+msgid "Warning: systems can only inherit from a single object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup-list.xml:11
@@ -2079,7 +2009,7 @@ msgid "Shell"
 msgstr "Shell"
 
 #: plugins/personal/posix/class_posixAccount.inc:1310
-#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:13
+#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:17
 msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
@@ -2277,7 +2207,7 @@ msgid "Your password hash method will not be changed!"
 msgstr "Su contraseña se ha cambiado correctamente."
 
 #: plugins/personal/generic/paste_generic.tpl:1
-#: ihtml/themes/default/infoPage.tpl:44
+#: ihtml/themes/default/infoPage.tpl:48
 msgid "User settings"
 msgstr "Caracteristicas del usuario"
 
@@ -2373,20 +2303,20 @@ msgstr "Nombre de la plantilla"
 
 #: plugins/personal/generic/generic.tpl:92
 #: plugins/personal/generic/class_user.inc:1708
-#: ihtml/themes/default/infoPage.tpl:16
+#: ihtml/themes/default/infoPage.tpl:20
 msgid "Personal title"
 msgstr "Título Personal"
 
 #: plugins/personal/generic/generic.tpl:102
 #: plugins/personal/generic/class_user.inc:1709
-#: ihtml/themes/default/infoPage.tpl:17
+#: ihtml/themes/default/infoPage.tpl:21
 msgid "Academic title"
 msgstr "Títulos académicos"
 
 #: plugins/personal/generic/generic.tpl:117
 #: plugins/personal/generic/class_user.inc:1368
 #: plugins/personal/generic/class_user.inc:1711
-#: ihtml/themes/default/infoPage.tpl:19
+#: ihtml/themes/default/infoPage.tpl:23
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
@@ -2463,7 +2393,7 @@ msgstr "Número empleado"
 
 #: plugins/personal/generic/generic.tpl:330
 #: plugins/personal/generic/class_user.inc:1725
-#: ihtml/themes/default/infoPage.tpl:33
+#: ihtml/themes/default/infoPage.tpl:37
 msgid "Employee type"
 msgstr "Funciones laborales"
 
@@ -2516,7 +2446,7 @@ msgstr "Unidad"
 
 #: plugins/personal/generic/generic.tpl:535
 #: plugins/personal/generic/class_user.inc:1665
-#: ihtml/themes/default/infoPage.tpl:29
+#: ihtml/themes/default/infoPage.tpl:33
 msgid "Street"
 msgstr "Calle"
 
@@ -2613,7 +2543,7 @@ msgstr "El método de contraseña seleccionado no está disponible."
 
 #: plugins/personal/generic/class_user.inc:1051
 msgid ""
-"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-"
 "imagick' to be installed!"
 msgstr ""
 
@@ -2658,12 +2588,12 @@ msgid "Login restrictions"
 msgstr "Restricciones de contraseña"
 
 #: plugins/personal/generic/class_user.inc:1722
-#: ihtml/themes/default/infoPage.tpl:30
+#: ihtml/themes/default/infoPage.tpl:34
 msgid "Department number"
 msgstr "Número del departamento"
 
 #: plugins/personal/generic/class_user.inc:1724
-#: ihtml/themes/default/infoPage.tpl:32
+#: ihtml/themes/default/infoPage.tpl:36
 msgid "Employee number"
 msgstr "Número de empleado"
 
@@ -2689,11 +2619,12 @@ msgid "Fax number"
 msgstr "Número de Fax"
 
 #: plugins/personal/generic/class_user.inc:1737
-#: ihtml/themes/default/infoPage.tpl:18
+#: ihtml/themes/default/infoPage.tpl:22
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
 #: plugins/personal/generic/class_user.inc:1738
+#: ihtml/themes/default/infoPage.tpl:25
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
@@ -2938,14 +2869,15 @@ msgstr "Migrar"
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:204
 #, fuzzy, php-format
-msgid "Migration failed for object %s, dn already exists!"
+msgid "Migration failed for object %s: DN already exists!"
 msgstr ""
 "Ha fallado al añadir un usuario administrativo: ¡El objeto '%s' ya existe!"
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:208
-#, php-format
-msgid "Migration failed for object %s, please check if it already exists!"
+#, fuzzy, php-format
+msgid "Migration failed for object %s: please check if it already exists!"
 msgstr ""
+"Ha fallado al añadir un usuario administrativo: ¡El objeto '%s' ya existe!"
 
 #: plugins/addons/propertyEditor/migrate.tpl:3
 msgid "Property migration assistant"
@@ -3049,7 +2981,7 @@ msgstr ""
 msgid "Dynamic object"
 msgstr "Objeto GOsa"
 
-#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:62
+#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:66
 msgid "The GOsa team"
 msgstr "El equipo de GOsa"
 
@@ -4388,6 +4320,10 @@ msgstr ""
 "No se puede un tipo de objeto estructural en su entrada raíz. Por favor "
 "intente añadir la clase de objeto '%s' manualmente."
 
+#: setup/class_setup.inc:183
+msgid "Setup"
+msgstr "Configuración"
+
 #: setup/class_setup.inc:195
 msgid "Completed"
 msgstr "Completado"
@@ -4623,17 +4559,7 @@ msgstr "Entrar en sesión SSL"
 msgid "User information"
 msgstr "mostrar información"
 
-#: ihtml/themes/default/infoPage.tpl:21
-#, fuzzy
-msgid "Home phone"
-msgstr "Número de teléfono personal"
-
-#: ihtml/themes/default/infoPage.tpl:27
-#, fuzzy
-msgid "Organizational unit"
-msgstr "Nombre de la Organización"
-
-#: ihtml/themes/default/infoPage.tpl:51
+#: ihtml/themes/default/infoPage.tpl:55
 #, fuzzy
 msgid "Administrative contact"
 msgstr "Parámetros administrativos"
@@ -6276,7 +6202,7 @@ msgstr ""
 msgid ""
 "Enables event logging in GOsa. Setting it to 'On' make GOsa log every action "
 "a user performs via syslog. If you use this in combination with rsyslog and "
-"configure it to mysql logging, you can browse all events in GOsa."
+"configure it to MySQL logging, you can browse all events in GOsa."
 msgstr ""
 
 #: include/class_core.inc:279
@@ -7052,6 +6978,42 @@ msgstr ""
 msgid "Welcome to GOsa"
 msgstr "Bienvenidos al asistente de configuración de GOsa"
 
+#, fuzzy
+#~ msgid "List of items"
+#~ msgstr "Lista de usuarios"
+
+#, fuzzy
+#~ msgid "Edit item"
+#~ msgstr "Editar certificados"
+
+#, fuzzy
+#~ msgid "Remove item"
+#~ msgstr "Eliminar foto"
+
+#, fuzzy
+#~ msgid "Container"
+#~ msgstr "Continuar"
+
+#, fuzzy
+#~ msgid "Config management"
+#~ msgstr "Sistemas-/Administración de Configuraciones"
+
+#, fuzzy
+#~ msgid "Distribution"
+#~ msgstr "Descripción"
+
+#, fuzzy
+#~ msgid "Component"
+#~ msgstr "Componentes del dominio"
+
+#, fuzzy
+#~ msgid "Home phone"
+#~ msgstr "Número de teléfono personal"
+
+#, fuzzy
+#~ msgid "Organizational unit"
+#~ msgstr "Nombre de la Organización"
+
 #, fuzzy
 #~ msgid "Max"
 #~ msgstr "Mayo"

diff --git a/gosa-core/locale/core/fr/LC_MESSAGES/messages.po b/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
index 129dc56f2c51f3b771fd6c3abaf50038a3591351..0708d93501c370be189b10f19f89eb91f44b360f 100644 (file)
--- a/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-01 15:07+0100\n"
+"POT-Creation-Date: 2010-12-01 16:21+0100\n"
 "PO-Revision-Date: 2010-11-23 23:25+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -21,7 +21,6 @@ msgstr ""
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml:21
 #: plugins/admin/groups/group-filter.xml:17
 #: plugins/admin/departments/dep-filter.xml:17
-#: plugins/admin/newConfigManagement/DeviceConfig-filter.xml:14
 #: plugins/admin/ogroups/ogroup-filter.xml:18
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.xml:32
 #: plugins/personal/posix/trustSelect/trust-filter.xml:17
@@ -105,7 +104,6 @@ msgstr "Rôle"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:34
 #: plugins/admin/ogroups/ogroup-list.xml:41
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
 #: plugins/admin/ogroups/class_ogroup.inc:157
@@ -161,7 +159,6 @@ msgstr "Nom"
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:63
 #: plugins/admin/departments/class_domain.inc:91
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:42
 #: plugins/admin/ogroups/ogroup-list.xml:49
 #: plugins/admin/ogroups/generic.tpl:15
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
@@ -186,7 +183,6 @@ msgstr ""
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/users/user-list.xml:78
 #: plugins/admin/groups/group-list.xml:62
 #: plugins/admin/departments/dep-list.xml:87
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:50
 #: plugins/admin/ogroups/ogroup-list.xml:62
 #: plugins/addons/propertyEditor/property-list.xml:96
 #: include/class_listing.inc:1183
@@ -206,7 +202,6 @@ msgstr "Créer"
 #: plugins/admin/groups/group-list.xml:98
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:64
 #: plugins/admin/ogroups/ogroup-list.xml:98
 #: plugins/personal/generic/generic_certs.tpl:22
 #: plugins/personal/generic/generic_certs.tpl:48
@@ -354,8 +349,6 @@ msgstr ""
 #: plugins/admin/groups/class_group.inc:758
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:94
 #: plugins/admin/ogroups/class_ogroup.inc:402
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:429
@@ -571,7 +564,7 @@ msgstr "Modèle"
 #: plugins/personal/generic/class_user.inc:1703
 #: plugins/personal/generic/class_user.inc:1857
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:15
+#: ihtml/themes/default/infoPage.tpl:19
 msgid "Given name"
 msgstr "Prénom"
 
@@ -630,7 +623,7 @@ msgstr "Modifier les propriétés UNIX"
 #: plugins/admin/groups/class_groupManagement.inc:165
 #: plugins/admin/ogroups/tabs_ogroups.inc:155
 #: plugins/generic/infoPage/class_infoPage.inc:112
-#: ihtml/themes/default/infoPage.tpl:20
+#: ihtml/themes/default/infoPage.tpl:24
 msgid "Mail"
 msgstr "Messagerie"
 
@@ -824,7 +817,7 @@ msgstr "Utilisateur"
 #: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/generic/class_user.inc:1702
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:14
+#: ihtml/themes/default/infoPage.tpl:18
 msgid "Surname"
 msgstr "Nom de famille"
 
@@ -1419,7 +1412,7 @@ msgstr "Département"
 #: plugins/admin/departments/generic.tpl:95
 #: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/class_user.inc:1734
-#: ihtml/themes/default/infoPage.tpl:28
+#: ihtml/themes/default/infoPage.tpl:32
 msgid "Location"
 msgstr "Lieu"
 
@@ -1484,6 +1477,7 @@ msgstr ""
 
 #: plugins/admin/departments/dep-filter.xml:35
 #: plugins/admin/departments/generic.tpl:4
+#: ihtml/themes/default/infoPage.tpl:31
 #, fuzzy
 msgid "Organizational Unit"
 msgstr "Nom de l'entreprise"
@@ -1497,7 +1491,7 @@ msgstr "Nom de l'entreprise"
 #: plugins/admin/departments/class_departmentManagement.inc:241
 #: plugins/personal/generic/generic.tpl:298
 #: plugins/personal/generic/class_user.inc:1720 setup/setup_feedback.tpl:10
-#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:26
+#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:30
 msgid "Organization"
 msgstr "Entreprise"
 
@@ -1627,68 +1621,6 @@ msgstr ""
 "page et appuyer sur le bouton 'Continuer' pour continuer la gestion des "
 "départements."
 
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:10
-#, fuzzy
-msgid "List of items"
-msgstr "Liste des utilisateurs"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:75
-#, fuzzy
-msgid "Edit item"
-msgstr "Editer des certificats"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:82
-#, fuzzy
-msgid "Remove item"
-msgstr "Suppression de l'image personnelle"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:9
-#, fuzzy
-msgid "Container"
-msgstr "Continuer"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:10
-msgid "Item"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:8
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:9
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:352
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:353
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:359
-#, fuzzy
-msgid "Config management"
-msgstr "Gestion Système / Configuration"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:95
-#, php-format
-msgid "Failed to load distributions, error was '%s'!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:262
-msgid "No selectable install methods returned!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:263
-#: setup/class_setup.inc:183
-msgid "Setup"
-msgstr "Installation"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:278
-#, fuzzy
-msgid "Distribution"
-msgstr "Stations Windows"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:284
-msgid "Release"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:290
-#, fuzzy
-msgid "Component"
-msgstr "Objet Domaine"
-
 #: plugins/admin/ogroups/paste_generic.tpl:1
 #, fuzzy
 msgid "Paste object group"
@@ -1699,9 +1631,7 @@ msgid "Please enter the new object group name"
 msgstr "Veuillez entrer un nouveau nom pour le groupe d'objet"
 
 #: plugins/admin/ogroups/paste_generic.tpl:16
-msgid ""
-"Copy members. Be careful with this option, systems can only inherit from a "
-"single object group!"
+msgid "Warning: systems can only inherit from a single object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup-list.xml:11
@@ -2077,7 +2007,7 @@ msgid "Shell"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:1310
-#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:13
+#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:17
 msgid "User ID"
 msgstr "ID de l'utilisateur"
 
@@ -2277,7 +2207,7 @@ msgid "Your password hash method will not be changed!"
 msgstr "Votre mot de passe à été changé avec succès."
 
 #: plugins/personal/generic/paste_generic.tpl:1
-#: ihtml/themes/default/infoPage.tpl:44
+#: ihtml/themes/default/infoPage.tpl:48
 msgid "User settings"
 msgstr "Préférences utilisateur"
 
@@ -2373,20 +2303,20 @@ msgstr "Nom du modèle"
 
 #: plugins/personal/generic/generic.tpl:92
 #: plugins/personal/generic/class_user.inc:1708
-#: ihtml/themes/default/infoPage.tpl:16
+#: ihtml/themes/default/infoPage.tpl:20
 msgid "Personal title"
 msgstr "Titre Personnel"
 
 #: plugins/personal/generic/generic.tpl:102
 #: plugins/personal/generic/class_user.inc:1709
-#: ihtml/themes/default/infoPage.tpl:17
+#: ihtml/themes/default/infoPage.tpl:21
 msgid "Academic title"
 msgstr "Titre Universitaire"
 
 #: plugins/personal/generic/generic.tpl:117
 #: plugins/personal/generic/class_user.inc:1368
 #: plugins/personal/generic/class_user.inc:1711
-#: ihtml/themes/default/infoPage.tpl:19
+#: ihtml/themes/default/infoPage.tpl:23
 msgid "Date of birth"
 msgstr "Date de naissance"
 
@@ -2463,7 +2393,7 @@ msgstr "No. de l'employé."
 
 #: plugins/personal/generic/generic.tpl:330
 #: plugins/personal/generic/class_user.inc:1725
-#: ihtml/themes/default/infoPage.tpl:33
+#: ihtml/themes/default/infoPage.tpl:37
 msgid "Employee type"
 msgstr "Type de l'employé"
 
@@ -2516,7 +2446,7 @@ msgstr "Unité"
 
 #: plugins/personal/generic/generic.tpl:535
 #: plugins/personal/generic/class_user.inc:1665
-#: ihtml/themes/default/infoPage.tpl:29
+#: ihtml/themes/default/infoPage.tpl:33
 msgid "Street"
 msgstr "Rue"
 
@@ -2616,7 +2546,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1051
 msgid ""
-"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-"
 "imagick' to be installed!"
 msgstr ""
 
@@ -2665,12 +2595,12 @@ msgid "Login restrictions"
 msgstr "Restrictions pour les mot de passe"
 
 #: plugins/personal/generic/class_user.inc:1722
-#: ihtml/themes/default/infoPage.tpl:30
+#: ihtml/themes/default/infoPage.tpl:34
 msgid "Department number"
 msgstr "Numéro du département"
 
 #: plugins/personal/generic/class_user.inc:1724
-#: ihtml/themes/default/infoPage.tpl:32
+#: ihtml/themes/default/infoPage.tpl:36
 msgid "Employee number"
 msgstr "Numéro de l'employé"
 
@@ -2696,11 +2626,12 @@ msgid "Fax number"
 msgstr "Numéro de fax"
 
 #: plugins/personal/generic/class_user.inc:1737
-#: ihtml/themes/default/infoPage.tpl:18
+#: ihtml/themes/default/infoPage.tpl:22
 msgid "Home postal address"
 msgstr "Adresse postale personnelle"
 
 #: plugins/personal/generic/class_user.inc:1738
+#: ihtml/themes/default/infoPage.tpl:25
 msgid "Home phone number"
 msgstr "Numéro de téléphone privé"
 
@@ -2947,14 +2878,15 @@ msgstr "Migrer"
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:204
 #, fuzzy, php-format
-msgid "Migration failed for object %s, dn already exists!"
+msgid "Migration failed for object %s: DN already exists!"
 msgstr ""
 "L'ajout d'un utilisateur administratif à échoué : l'objet '%s' existe déja !"
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:208
-#, php-format
-msgid "Migration failed for object %s, please check if it already exists!"
+#, fuzzy, php-format
+msgid "Migration failed for object %s: please check if it already exists!"
 msgstr ""
+"L'ajout d'un utilisateur administratif à échoué : l'objet '%s' existe déja !"
 
 #: plugins/addons/propertyEditor/migrate.tpl:3
 msgid "Property migration assistant"
@@ -3056,7 +2988,7 @@ msgstr ""
 msgid "Dynamic object"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:62
+#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:66
 msgid "The GOsa team"
 msgstr "L'équipe de GOsa"
 
@@ -4412,6 +4344,10 @@ msgstr ""
 "Impossible de gérer l'objet structural de votre objet racine. S'il vous "
 "plaît essayer de ajouter la classe d'objet '%s' à la main."
 
+#: setup/class_setup.inc:183
+msgid "Setup"
+msgstr "Installation"
+
 #: setup/class_setup.inc:195
 msgid "Completed"
 msgstr "Terminé"
@@ -4634,17 +4570,7 @@ msgstr "Démarrer une session SSL"
 msgid "User information"
 msgstr "Montrer les informations"
 
-#: ihtml/themes/default/infoPage.tpl:21
-#, fuzzy
-msgid "Home phone"
-msgstr "Numéro de téléphone privé"
-
-#: ihtml/themes/default/infoPage.tpl:27
-#, fuzzy
-msgid "Organizational unit"
-msgstr "Nom de l'entreprise"
-
-#: ihtml/themes/default/infoPage.tpl:51
+#: ihtml/themes/default/infoPage.tpl:55
 #, fuzzy
 msgid "Administrative contact"
 msgstr "Paramètres administratifs"
@@ -6242,7 +6168,7 @@ msgstr ""
 msgid ""
 "Enables event logging in GOsa. Setting it to 'On' make GOsa log every action "
 "a user performs via syslog. If you use this in combination with rsyslog and "
-"configure it to mysql logging, you can browse all events in GOsa."
+"configure it to MySQL logging, you can browse all events in GOsa."
 msgstr ""
 
 #: include/class_core.inc:279
@@ -7000,6 +6926,42 @@ msgstr ""
 msgid "Welcome to GOsa"
 msgstr "Bienvenue dans GOsa"
 
+#, fuzzy
+#~ msgid "List of items"
+#~ msgstr "Liste des utilisateurs"
+
+#, fuzzy
+#~ msgid "Edit item"
+#~ msgstr "Editer des certificats"
+
+#, fuzzy
+#~ msgid "Remove item"
+#~ msgstr "Suppression de l'image personnelle"
+
+#, fuzzy
+#~ msgid "Container"
+#~ msgstr "Continuer"
+
+#, fuzzy
+#~ msgid "Config management"
+#~ msgstr "Gestion Système / Configuration"
+
+#, fuzzy
+#~ msgid "Distribution"
+#~ msgstr "Stations Windows"
+
+#, fuzzy
+#~ msgid "Component"
+#~ msgstr "Objet Domaine"
+
+#, fuzzy
+#~ msgid "Home phone"
+#~ msgstr "Numéro de téléphone privé"
+
+#, fuzzy
+#~ msgid "Organizational unit"
+#~ msgstr "Nom de l'entreprise"
+
 #, fuzzy
 #~ msgid "Max"
 #~ msgstr "Mai"

diff --git a/gosa-core/locale/core/it/LC_MESSAGES/messages.po b/gosa-core/locale/core/it/LC_MESSAGES/messages.po
index 6d383dcdcb9e99c5e70aa8eb7914c7bc9a3aed94..87573b1dab39c961b91c7d7c65980c41c6654be1 100644 (file)
--- a/gosa-core/locale/core/it/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-01 15:07+0100\n"
+"POT-Creation-Date: 2010-12-01 16:21+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -22,7 +22,6 @@ msgstr ""
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml:21
 #: plugins/admin/groups/group-filter.xml:17
 #: plugins/admin/departments/dep-filter.xml:17
-#: plugins/admin/newConfigManagement/DeviceConfig-filter.xml:14
 #: plugins/admin/ogroups/ogroup-filter.xml:18
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.xml:32
 #: plugins/personal/posix/trustSelect/trust-filter.xml:17
@@ -108,7 +107,6 @@ msgstr "Ruolo"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:34
 #: plugins/admin/ogroups/ogroup-list.xml:41
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
 #: plugins/admin/ogroups/class_ogroup.inc:157
@@ -164,7 +162,6 @@ msgstr "Cognome"
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:63
 #: plugins/admin/departments/class_domain.inc:91
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:42
 #: plugins/admin/ogroups/ogroup-list.xml:49
 #: plugins/admin/ogroups/generic.tpl:15
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
@@ -189,7 +186,6 @@ msgstr "Descrizione"
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/users/user-list.xml:78
 #: plugins/admin/groups/group-list.xml:62
 #: plugins/admin/departments/dep-list.xml:87
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:50
 #: plugins/admin/ogroups/ogroup-list.xml:62
 #: plugins/addons/propertyEditor/property-list.xml:96
 #: include/class_listing.inc:1183
@@ -209,7 +205,6 @@ msgstr "Creare"
 #: plugins/admin/groups/group-list.xml:98
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:64
 #: plugins/admin/ogroups/ogroup-list.xml:98
 #: plugins/personal/generic/generic_certs.tpl:22
 #: plugins/personal/generic/generic_certs.tpl:48
@@ -366,8 +361,6 @@ msgstr ""
 #: plugins/admin/groups/class_group.inc:758
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:94
 #: plugins/admin/ogroups/class_ogroup.inc:402
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:429
@@ -590,7 +583,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:1703
 #: plugins/personal/generic/class_user.inc:1857
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:15
+#: ihtml/themes/default/infoPage.tpl:19
 msgid "Given name"
 msgstr "Nome"
 
@@ -652,7 +645,7 @@ msgstr "Modifica proprietà"
 #: plugins/admin/groups/class_groupManagement.inc:165
 #: plugins/admin/ogroups/tabs_ogroups.inc:155
 #: plugins/generic/infoPage/class_infoPage.inc:112
-#: ihtml/themes/default/infoPage.tpl:20
+#: ihtml/themes/default/infoPage.tpl:24
 msgid "Mail"
 msgstr "Posta"
 
@@ -848,7 +841,7 @@ msgstr ""
 #: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/generic/class_user.inc:1702
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:14
+#: ihtml/themes/default/infoPage.tpl:18
 msgid "Surname"
 msgstr "Cognome"
 
@@ -1465,7 +1458,7 @@ msgstr "Stato"
 #: plugins/admin/departments/generic.tpl:95
 #: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/class_user.inc:1734
-#: ihtml/themes/default/infoPage.tpl:28
+#: ihtml/themes/default/infoPage.tpl:32
 msgid "Location"
 msgstr "Località"
 
@@ -1526,6 +1519,7 @@ msgstr ""
 
 #: plugins/admin/departments/dep-filter.xml:35
 #: plugins/admin/departments/generic.tpl:4
+#: ihtml/themes/default/infoPage.tpl:31
 #, fuzzy
 msgid "Organizational Unit"
 msgstr "Unità del'organizzazione"
@@ -1539,7 +1533,7 @@ msgstr "Unità del'organizzazione"
 #: plugins/admin/departments/class_departmentManagement.inc:241
 #: plugins/personal/generic/generic.tpl:298
 #: plugins/personal/generic/class_user.inc:1720 setup/setup_feedback.tpl:10
-#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:26
+#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:30
 msgid "Organization"
 msgstr "Organizzazione"
 
@@ -1667,69 +1661,6 @@ msgid ""
 "management dialog."
 msgstr ""
 
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:10
-#, fuzzy
-msgid "List of items"
-msgstr "Lista degli utenti"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:75
-#, fuzzy
-msgid "Edit item"
-msgstr "Modifica certificati"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:82
-#, fuzzy
-msgid "Remove item"
-msgstr "Elimina foto"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:9
-#, fuzzy
-msgid "Container"
-msgstr "Continua"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:10
-msgid "Item"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:8
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:9
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:352
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:353
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:359
-#, fuzzy
-msgid "Config management"
-msgstr "Riferimenti"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:95
-#, php-format
-msgid "Failed to load distributions, error was '%s'!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:262
-msgid "No selectable install methods returned!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:263
-#: setup/class_setup.inc:183
-#, fuzzy
-msgid "Setup"
-msgstr "Imposta"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:278
-#, fuzzy
-msgid "Distribution"
-msgstr "Descrizione"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:284
-msgid "Release"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:290
-#, fuzzy
-msgid "Component"
-msgstr "Amministratori di Dominio"
-
 #: plugins/admin/ogroups/paste_generic.tpl:1
 #, fuzzy
 msgid "Paste object group"
@@ -1741,9 +1672,7 @@ msgid "Please enter the new object group name"
 msgstr "Inserisci la URI del server LDAP"
 
 #: plugins/admin/ogroups/paste_generic.tpl:16
-msgid ""
-"Copy members. Be careful with this option, systems can only inherit from a "
-"single object group!"
+msgid "Warning: systems can only inherit from a single object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup-list.xml:11
@@ -2130,7 +2059,7 @@ msgid "Shell"
 msgstr "Shell"
 
 #: plugins/personal/posix/class_posixAccount.inc:1310
-#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:13
+#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:17
 msgid "User ID"
 msgstr ""
 
@@ -2340,7 +2269,7 @@ msgid "Your password hash method will not be changed!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
 #: plugins/personal/generic/paste_generic.tpl:1
-#: ihtml/themes/default/infoPage.tpl:44
+#: ihtml/themes/default/infoPage.tpl:48
 #, fuzzy
 msgid "User settings"
 msgstr "Opzioni di posta dell'identità"
@@ -2441,20 +2370,20 @@ msgstr "Template"
 
 #: plugins/personal/generic/generic.tpl:92
 #: plugins/personal/generic/class_user.inc:1708
-#: ihtml/themes/default/infoPage.tpl:16
+#: ihtml/themes/default/infoPage.tpl:20
 msgid "Personal title"
 msgstr "Titolo onorifico"
 
 #: plugins/personal/generic/generic.tpl:102
 #: plugins/personal/generic/class_user.inc:1709
-#: ihtml/themes/default/infoPage.tpl:17
+#: ihtml/themes/default/infoPage.tpl:21
 msgid "Academic title"
 msgstr "Titolo di studio"
 
 #: plugins/personal/generic/generic.tpl:117
 #: plugins/personal/generic/class_user.inc:1368
 #: plugins/personal/generic/class_user.inc:1711
-#: ihtml/themes/default/infoPage.tpl:19
+#: ihtml/themes/default/infoPage.tpl:23
 msgid "Date of birth"
 msgstr "Data di nascita"
 
@@ -2532,7 +2461,7 @@ msgstr "Matricola"
 
 #: plugins/personal/generic/generic.tpl:330
 #: plugins/personal/generic/class_user.inc:1725
-#: ihtml/themes/default/infoPage.tpl:33
+#: ihtml/themes/default/infoPage.tpl:37
 msgid "Employee type"
 msgstr "Qualifica"
 
@@ -2585,7 +2514,7 @@ msgstr "Unità"
 
 #: plugins/personal/generic/generic.tpl:535
 #: plugins/personal/generic/class_user.inc:1665
-#: ihtml/themes/default/infoPage.tpl:29
+#: ihtml/themes/default/infoPage.tpl:33
 msgid "Street"
 msgstr "Strada"
 
@@ -2683,7 +2612,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1051
 msgid ""
-"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-"
 "imagick' to be installed!"
 msgstr ""
 
@@ -2729,13 +2658,13 @@ msgid "Login restrictions"
 msgstr "La password spira il"
 
 #: plugins/personal/generic/class_user.inc:1722
-#: ihtml/themes/default/infoPage.tpl:30
+#: ihtml/themes/default/infoPage.tpl:34
 #, fuzzy
 msgid "Department number"
 msgstr "Dipartimento"
 
 #: plugins/personal/generic/class_user.inc:1724
-#: ihtml/themes/default/infoPage.tpl:32
+#: ihtml/themes/default/infoPage.tpl:36
 #, fuzzy
 msgid "Employee number"
 msgstr "Qualifica"
@@ -2766,11 +2695,12 @@ msgid "Fax number"
 msgstr "Numero di telefono"
 
 #: plugins/personal/generic/class_user.inc:1737
-#: ihtml/themes/default/infoPage.tpl:18
+#: ihtml/themes/default/infoPage.tpl:22
 msgid "Home postal address"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1738
+#: ihtml/themes/default/infoPage.tpl:25
 #, fuzzy
 msgid "Home phone number"
 msgstr "Numero di telefono"
@@ -3020,12 +2950,12 @@ msgstr "Creare"
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:204
 #, php-format
-msgid "Migration failed for object %s, dn already exists!"
+msgid "Migration failed for object %s: DN already exists!"
 msgstr ""
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:208
 #, php-format
-msgid "Migration failed for object %s, please check if it already exists!"
+msgid "Migration failed for object %s: please check if it already exists!"
 msgstr ""
 
 #: plugins/addons/propertyEditor/migrate.tpl:3
@@ -3130,7 +3060,7 @@ msgstr ""
 msgid "Dynamic object"
 msgstr "Oggetto"
 
-#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:62
+#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:66
 msgid "The GOsa team"
 msgstr "Il team di GOsa"
 
@@ -4494,6 +4424,11 @@ msgid ""
 "add the object class '%s' manually."
 msgstr ""
 
+#: setup/class_setup.inc:183
+#, fuzzy
+msgid "Setup"
+msgstr "Imposta"
+
 #: setup/class_setup.inc:195
 #, fuzzy
 msgid "Completed"
@@ -4712,15 +4647,7 @@ msgstr ""
 msgid "User information"
 msgstr "Informazioni personali"
 
-#: ihtml/themes/default/infoPage.tpl:21
-msgid "Home phone"
-msgstr "Telefono privato"
-
-#: ihtml/themes/default/infoPage.tpl:27
-msgid "Organizational unit"
-msgstr "Unità del'organizzazione"
-
-#: ihtml/themes/default/infoPage.tpl:51
+#: ihtml/themes/default/infoPage.tpl:55
 #, fuzzy
 msgid "Administrative contact"
 msgstr "Amministrazione"
@@ -6318,7 +6245,7 @@ msgstr ""
 msgid ""
 "Enables event logging in GOsa. Setting it to 'On' make GOsa log every action "
 "a user performs via syslog. If you use this in combination with rsyslog and "
-"configure it to mysql logging, you can browse all events in GOsa."
+"configure it to MySQL logging, you can browse all events in GOsa."
 msgstr ""
 
 #: include/class_core.inc:279
@@ -7085,6 +7012,40 @@ msgstr ""
 msgid "Welcome to GOsa"
 msgstr "Benvenuto nel setup di GOsa!"
 
+#, fuzzy
+#~ msgid "List of items"
+#~ msgstr "Lista degli utenti"
+
+#, fuzzy
+#~ msgid "Edit item"
+#~ msgstr "Modifica certificati"
+
+#, fuzzy
+#~ msgid "Remove item"
+#~ msgstr "Elimina foto"
+
+#, fuzzy
+#~ msgid "Container"
+#~ msgstr "Continua"
+
+#, fuzzy
+#~ msgid "Config management"
+#~ msgstr "Riferimenti"
+
+#, fuzzy
+#~ msgid "Distribution"
+#~ msgstr "Descrizione"
+
+#, fuzzy
+#~ msgid "Component"
+#~ msgstr "Amministratori di Dominio"
+
+#~ msgid "Home phone"
+#~ msgstr "Telefono privato"
+
+#~ msgid "Organizational unit"
+#~ msgstr "Unità del'organizzazione"
+
 #, fuzzy
 #~ msgid "Max"
 #~ msgstr "Maggio"

diff --git a/gosa-core/locale/core/messages.po b/gosa-core/locale/core/messages.po
index 1e6432ee962061849091bdb16f49c93340029bc0..72c91bb89402e9a478c8e6c6197a0e6ef287b00b 100644 (file)
--- a/gosa-core/locale/core/messages.po
+++ b/gosa-core/locale/core/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-01 15:07+0100\n"
+"POT-Creation-Date: 2010-12-01 16:21+0100\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"
@@ -23,7 +23,6 @@ msgstr ""
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml:21
 #: plugins/admin/groups/group-filter.xml:17
 #: plugins/admin/departments/dep-filter.xml:17
-#: plugins/admin/newConfigManagement/DeviceConfig-filter.xml:14
 #: plugins/admin/ogroups/ogroup-filter.xml:18
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.xml:32
 #: plugins/personal/posix/trustSelect/trust-filter.xml:17
@@ -105,7 +104,6 @@ msgstr ""
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:34
 #: plugins/admin/ogroups/ogroup-list.xml:41
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
 #: plugins/admin/ogroups/class_ogroup.inc:157
@@ -161,7 +159,6 @@ msgstr ""
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:63
 #: plugins/admin/departments/class_domain.inc:91
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:42
 #: plugins/admin/ogroups/ogroup-list.xml:49
 #: plugins/admin/ogroups/generic.tpl:15
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
@@ -186,7 +183,6 @@ msgstr ""
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/users/user-list.xml:78
 #: plugins/admin/groups/group-list.xml:62
 #: plugins/admin/departments/dep-list.xml:87
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:50
 #: plugins/admin/ogroups/ogroup-list.xml:62
 #: plugins/addons/propertyEditor/property-list.xml:96
 #: include/class_listing.inc:1183
@@ -206,7 +202,6 @@ msgstr ""
 #: plugins/admin/groups/group-list.xml:98
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:64
 #: plugins/admin/ogroups/ogroup-list.xml:98
 #: plugins/personal/generic/generic_certs.tpl:22
 #: plugins/personal/generic/generic_certs.tpl:48
@@ -352,8 +347,6 @@ msgstr ""
 #: plugins/admin/groups/class_group.inc:758
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:94
 #: plugins/admin/ogroups/class_ogroup.inc:402
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:429
@@ -564,7 +557,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:1703
 #: plugins/personal/generic/class_user.inc:1857
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:15
+#: ihtml/themes/default/infoPage.tpl:19
 msgid "Given name"
 msgstr ""
 
@@ -621,7 +614,7 @@ msgstr ""
 #: plugins/admin/groups/class_groupManagement.inc:165
 #: plugins/admin/ogroups/tabs_ogroups.inc:155
 #: plugins/generic/infoPage/class_infoPage.inc:112
-#: ihtml/themes/default/infoPage.tpl:20
+#: ihtml/themes/default/infoPage.tpl:24
 msgid "Mail"
 msgstr ""
 
@@ -804,7 +797,7 @@ msgstr ""
 #: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/generic/class_user.inc:1702
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:14
+#: ihtml/themes/default/infoPage.tpl:18
 msgid "Surname"
 msgstr ""
 
@@ -1374,7 +1367,7 @@ msgstr ""
 #: plugins/admin/departments/generic.tpl:95
 #: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/class_user.inc:1734
-#: ihtml/themes/default/infoPage.tpl:28
+#: ihtml/themes/default/infoPage.tpl:32
 msgid "Location"
 msgstr ""
 
@@ -1434,6 +1427,7 @@ msgstr ""
 
 #: plugins/admin/departments/dep-filter.xml:35
 #: plugins/admin/departments/generic.tpl:4
+#: ihtml/themes/default/infoPage.tpl:31
 msgid "Organizational Unit"
 msgstr ""
 
@@ -1446,7 +1440,7 @@ msgstr ""
 #: plugins/admin/departments/class_departmentManagement.inc:241
 #: plugins/personal/generic/generic.tpl:298
 #: plugins/personal/generic/class_user.inc:1720 setup/setup_feedback.tpl:10
-#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:26
+#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:30
 msgid "Organization"
 msgstr ""
 
@@ -1568,61 +1562,6 @@ msgid ""
 "management dialog."
 msgstr ""
 
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:10
-msgid "List of items"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:75
-msgid "Edit item"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:82
-msgid "Remove item"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:9
-msgid "Container"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:10
-msgid "Item"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:8
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:9
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:352
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:353
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:359
-msgid "Config management"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:95
-#, php-format
-msgid "Failed to load distributions, error was '%s'!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:262
-msgid "No selectable install methods returned!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:263
-#: setup/class_setup.inc:183
-msgid "Setup"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:278
-msgid "Distribution"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:284
-msgid "Release"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:290
-msgid "Component"
-msgstr ""
-
 #: plugins/admin/ogroups/paste_generic.tpl:1
 msgid "Paste object group"
 msgstr ""
@@ -1632,9 +1571,7 @@ msgid "Please enter the new object group name"
 msgstr ""
 
 #: plugins/admin/ogroups/paste_generic.tpl:16
-msgid ""
-"Copy members. Be careful with this option, systems can only inherit from a "
-"single object group!"
+msgid "Warning: systems can only inherit from a single object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup-list.xml:11
@@ -1990,7 +1927,7 @@ msgid "Shell"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:1310
-#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:13
+#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:17
 msgid "User ID"
 msgstr ""
 
@@ -2174,7 +2111,7 @@ msgid "Your password hash method will not be changed!"
 msgstr ""
 
 #: plugins/personal/generic/paste_generic.tpl:1
-#: ihtml/themes/default/infoPage.tpl:44
+#: ihtml/themes/default/infoPage.tpl:48
 msgid "User settings"
 msgstr ""
 
@@ -2265,20 +2202,20 @@ msgstr ""
 
 #: plugins/personal/generic/generic.tpl:92
 #: plugins/personal/generic/class_user.inc:1708
-#: ihtml/themes/default/infoPage.tpl:16
+#: ihtml/themes/default/infoPage.tpl:20
 msgid "Personal title"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:102
 #: plugins/personal/generic/class_user.inc:1709
-#: ihtml/themes/default/infoPage.tpl:17
+#: ihtml/themes/default/infoPage.tpl:21
 msgid "Academic title"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:117
 #: plugins/personal/generic/class_user.inc:1368
 #: plugins/personal/generic/class_user.inc:1711
-#: ihtml/themes/default/infoPage.tpl:19
+#: ihtml/themes/default/infoPage.tpl:23
 msgid "Date of birth"
 msgstr ""
 
@@ -2354,7 +2291,7 @@ msgstr ""
 
 #: plugins/personal/generic/generic.tpl:330
 #: plugins/personal/generic/class_user.inc:1725
-#: ihtml/themes/default/infoPage.tpl:33
+#: ihtml/themes/default/infoPage.tpl:37
 msgid "Employee type"
 msgstr ""
 
@@ -2407,7 +2344,7 @@ msgstr ""
 
 #: plugins/personal/generic/generic.tpl:535
 #: plugins/personal/generic/class_user.inc:1665
-#: ihtml/themes/default/infoPage.tpl:29
+#: ihtml/themes/default/infoPage.tpl:33
 msgid "Street"
 msgstr ""
 
@@ -2501,7 +2438,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1051
 msgid ""
-"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-"
 "imagick' to be installed!"
 msgstr ""
 
@@ -2543,12 +2480,12 @@ msgid "Login restrictions"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1722
-#: ihtml/themes/default/infoPage.tpl:30
+#: ihtml/themes/default/infoPage.tpl:34
 msgid "Department number"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1724
-#: ihtml/themes/default/infoPage.tpl:32
+#: ihtml/themes/default/infoPage.tpl:36
 msgid "Employee number"
 msgstr ""
 
@@ -2573,11 +2510,12 @@ msgid "Fax number"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1737
-#: ihtml/themes/default/infoPage.tpl:18
+#: ihtml/themes/default/infoPage.tpl:22
 msgid "Home postal address"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1738
+#: ihtml/themes/default/infoPage.tpl:25
 msgid "Home phone number"
 msgstr ""
 
@@ -2800,12 +2738,12 @@ msgstr ""
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:204
 #, php-format
-msgid "Migration failed for object %s, dn already exists!"
+msgid "Migration failed for object %s: DN already exists!"
 msgstr ""
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:208
 #, php-format
-msgid "Migration failed for object %s, please check if it already exists!"
+msgid "Migration failed for object %s: please check if it already exists!"
 msgstr ""
 
 #: plugins/addons/propertyEditor/migrate.tpl:3
@@ -2903,7 +2841,7 @@ msgstr ""
 msgid "Dynamic object"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:62
+#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:66
 msgid "The GOsa team"
 msgstr ""
 
@@ -4116,6 +4054,10 @@ msgid ""
 "add the object class '%s' manually."
 msgstr ""
 
+#: setup/class_setup.inc:183
+msgid "Setup"
+msgstr ""
+
 #: setup/class_setup.inc:195
 msgid "Completed"
 msgstr ""
@@ -4314,15 +4256,7 @@ msgstr ""
 msgid "User information"
 msgstr ""
 
-#: ihtml/themes/default/infoPage.tpl:21
-msgid "Home phone"
-msgstr ""
-
-#: ihtml/themes/default/infoPage.tpl:27
-msgid "Organizational unit"
-msgstr ""
-
-#: ihtml/themes/default/infoPage.tpl:51
+#: ihtml/themes/default/infoPage.tpl:55
 msgid "Administrative contact"
 msgstr ""
 
@@ -5814,7 +5748,7 @@ msgstr ""
 msgid ""
 "Enables event logging in GOsa. Setting it to 'On' make GOsa log every action "
 "a user performs via syslog. If you use this in combination with rsyslog and "
-"configure it to mysql logging, you can browse all events in GOsa."
+"configure it to MySQL logging, you can browse all events in GOsa."
 msgstr ""
 
 #: include/class_core.inc:279

diff --git a/gosa-core/locale/core/nl/LC_MESSAGES/messages.po b/gosa-core/locale/core/nl/LC_MESSAGES/messages.po
index 55880df7805e41c877c00429ab9d2036cbbb4649..1cbd6318efe086bdc56eeffcb5a6df0098e6873a 100644 (file)
--- a/gosa-core/locale/core/nl/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-01 15:07+0100\n"
+"POT-Creation-Date: 2010-12-01 16:21+0100\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"
@@ -26,7 +26,6 @@ msgstr ""
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml:21
 #: plugins/admin/groups/group-filter.xml:17
 #: plugins/admin/departments/dep-filter.xml:17
-#: plugins/admin/newConfigManagement/DeviceConfig-filter.xml:14
 #: plugins/admin/ogroups/ogroup-filter.xml:18
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.xml:32
 #: plugins/personal/posix/trustSelect/trust-filter.xml:17
@@ -112,7 +111,6 @@ msgstr "Funktie"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:34
 #: plugins/admin/ogroups/ogroup-list.xml:41
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
 #: plugins/admin/ogroups/class_ogroup.inc:157
@@ -168,7 +166,6 @@ msgstr "Naam"
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:63
 #: plugins/admin/departments/class_domain.inc:91
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:42
 #: plugins/admin/ogroups/ogroup-list.xml:49
 #: plugins/admin/ogroups/generic.tpl:15
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
@@ -193,7 +190,6 @@ msgstr "Omschrijving"
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/users/user-list.xml:78
 #: plugins/admin/groups/group-list.xml:62
 #: plugins/admin/departments/dep-list.xml:87
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:50
 #: plugins/admin/ogroups/ogroup-list.xml:62
 #: plugins/addons/propertyEditor/property-list.xml:96
 #: include/class_listing.inc:1183
@@ -213,7 +209,6 @@ msgstr "Aanmaken"
 #: plugins/admin/groups/group-list.xml:98
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:64
 #: plugins/admin/ogroups/ogroup-list.xml:98
 #: plugins/personal/generic/generic_certs.tpl:22
 #: plugins/personal/generic/generic_certs.tpl:48
@@ -370,8 +365,6 @@ msgstr ""
 #: plugins/admin/groups/class_group.inc:758
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:94
 #: plugins/admin/ogroups/class_ogroup.inc:402
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:429
@@ -596,7 +589,7 @@ msgstr "Sjabloon"
 #: plugins/personal/generic/class_user.inc:1703
 #: plugins/personal/generic/class_user.inc:1857
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:15
+#: ihtml/themes/default/infoPage.tpl:19
 msgid "Given name"
 msgstr "Naam"
 
@@ -657,7 +650,7 @@ msgstr "Bewerk UNIX eigenschappen"
 #: plugins/admin/groups/class_groupManagement.inc:165
 #: plugins/admin/ogroups/tabs_ogroups.inc:155
 #: plugins/generic/infoPage/class_infoPage.inc:112
-#: ihtml/themes/default/infoPage.tpl:20
+#: ihtml/themes/default/infoPage.tpl:24
 msgid "Mail"
 msgstr "E-mail"
 
@@ -853,7 +846,7 @@ msgstr "Gebruiker"
 #: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/generic/class_user.inc:1702
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:14
+#: ihtml/themes/default/infoPage.tpl:18
 msgid "Surname"
 msgstr "Achternaam"
 
@@ -1475,7 +1468,7 @@ msgstr "Provincie"
 #: plugins/admin/departments/generic.tpl:95
 #: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/class_user.inc:1734
-#: ihtml/themes/default/infoPage.tpl:28
+#: ihtml/themes/default/infoPage.tpl:32
 msgid "Location"
 msgstr "Plaats"
 
@@ -1537,6 +1530,7 @@ msgstr ""
 
 #: plugins/admin/departments/dep-filter.xml:35
 #: plugins/admin/departments/generic.tpl:4
+#: ihtml/themes/default/infoPage.tpl:31
 #, fuzzy
 msgid "Organizational Unit"
 msgstr "Afdeling"
@@ -1550,7 +1544,7 @@ msgstr "Afdeling"
 #: plugins/admin/departments/class_departmentManagement.inc:241
 #: plugins/personal/generic/generic.tpl:298
 #: plugins/personal/generic/class_user.inc:1720 setup/setup_feedback.tpl:10
-#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:26
+#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:30
 msgid "Organization"
 msgstr "Organisatie"
 
@@ -1683,69 +1677,6 @@ msgid ""
 "management dialog."
 msgstr ""
 
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:10
-#, fuzzy
-msgid "List of items"
-msgstr "Lijst met gebruikers"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:75
-#, fuzzy
-msgid "Edit item"
-msgstr "Bewerk certificaten"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:82
-#, fuzzy
-msgid "Remove item"
-msgstr "Plaatje verwijderen"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:9
-#, fuzzy
-msgid "Container"
-msgstr "Doorgaan"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:10
-msgid "Item"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:8
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:9
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:352
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:353
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:359
-#, fuzzy
-msgid "Config management"
-msgstr "Systeembeheer"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:95
-#, php-format
-msgid "Failed to load distributions, error was '%s'!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:262
-msgid "No selectable install methods returned!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:263
-#: setup/class_setup.inc:183
-#, fuzzy
-msgid "Setup"
-msgstr "Stel in"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:278
-#, fuzzy
-msgid "Distribution"
-msgstr "Omschrijving"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:284
-msgid "Release"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:290
-#, fuzzy
-msgid "Component"
-msgstr "Windows beheerders"
-
 #: plugins/admin/ogroups/paste_generic.tpl:1
 #, fuzzy
 msgid "Paste object group"
@@ -1757,9 +1688,7 @@ msgid "Please enter the new object group name"
 msgstr "Geef a.u.b. een nieuwe naam op"
 
 #: plugins/admin/ogroups/paste_generic.tpl:16
-msgid ""
-"Copy members. Be careful with this option, systems can only inherit from a "
-"single object group!"
+msgid "Warning: systems can only inherit from a single object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup-list.xml:11
@@ -2145,7 +2074,7 @@ msgid "Shell"
 msgstr "Shell"
 
 #: plugins/personal/posix/class_posixAccount.inc:1310
-#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:13
+#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:17
 msgid "User ID"
 msgstr "Gebruikers ID"
 
@@ -2356,7 +2285,7 @@ msgid "Your password hash method will not be changed!"
 msgstr "Uw wachtwoord is verlopen! Kies a.u.b. een nieuw wachtwoord. "
 
 #: plugins/personal/generic/paste_generic.tpl:1
-#: ihtml/themes/default/infoPage.tpl:44
+#: ihtml/themes/default/infoPage.tpl:48
 msgid "User settings"
 msgstr "Gebruikersinstellingen"
 
@@ -2452,20 +2381,20 @@ msgstr "Sjabloon naam"
 
 #: plugins/personal/generic/generic.tpl:92
 #: plugins/personal/generic/class_user.inc:1708
-#: ihtml/themes/default/infoPage.tpl:16
+#: ihtml/themes/default/infoPage.tpl:20
 msgid "Personal title"
 msgstr "Aanhef"
 
 #: plugins/personal/generic/generic.tpl:102
 #: plugins/personal/generic/class_user.inc:1709
-#: ihtml/themes/default/infoPage.tpl:17
+#: ihtml/themes/default/infoPage.tpl:21
 msgid "Academic title"
 msgstr "Academische titel"
 
 #: plugins/personal/generic/generic.tpl:117
 #: plugins/personal/generic/class_user.inc:1368
 #: plugins/personal/generic/class_user.inc:1711
-#: ihtml/themes/default/infoPage.tpl:19
+#: ihtml/themes/default/infoPage.tpl:23
 msgid "Date of birth"
 msgstr "Geboortedatum"
 
@@ -2543,7 +2472,7 @@ msgstr "Personeel nr."
 
 #: plugins/personal/generic/generic.tpl:330
 #: plugins/personal/generic/class_user.inc:1725
-#: ihtml/themes/default/infoPage.tpl:33
+#: ihtml/themes/default/infoPage.tpl:37
 msgid "Employee type"
 msgstr "Functie"
 
@@ -2596,7 +2525,7 @@ msgstr "Eenheid"
 
 #: plugins/personal/generic/generic.tpl:535
 #: plugins/personal/generic/class_user.inc:1665
-#: ihtml/themes/default/infoPage.tpl:29
+#: ihtml/themes/default/infoPage.tpl:33
 msgid "Street"
 msgstr "Straat"
 
@@ -2696,7 +2625,7 @@ msgstr "Dit programma is niet meer beschikbaar."
 
 #: plugins/personal/generic/class_user.inc:1051
 msgid ""
-"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-"
 "imagick' to be installed!"
 msgstr ""
 
@@ -2743,13 +2672,13 @@ msgid "Login restrictions"
 msgstr "Wachtwoord verloopt op"
 
 #: plugins/personal/generic/class_user.inc:1722
-#: ihtml/themes/default/infoPage.tpl:30
+#: ihtml/themes/default/infoPage.tpl:34
 #, fuzzy
 msgid "Department number"
 msgstr "Afdelingnaam"
 
 #: plugins/personal/generic/class_user.inc:1724
-#: ihtml/themes/default/infoPage.tpl:32
+#: ihtml/themes/default/infoPage.tpl:36
 #, fuzzy
 msgid "Employee number"
 msgstr "Functie"
@@ -2780,11 +2709,12 @@ msgid "Fax number"
 msgstr "Serienummer"
 
 #: plugins/personal/generic/class_user.inc:1737
-#: ihtml/themes/default/infoPage.tpl:18
+#: ihtml/themes/default/infoPage.tpl:22
 msgid "Home postal address"
 msgstr "Adres thuis"
 
 #: plugins/personal/generic/class_user.inc:1738
+#: ihtml/themes/default/infoPage.tpl:25
 #, fuzzy
 msgid "Home phone number"
 msgstr "Telefoonnummer"
@@ -3038,12 +2968,12 @@ msgstr "Aanmaken"
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:204
 #, php-format
-msgid "Migration failed for object %s, dn already exists!"
+msgid "Migration failed for object %s: DN already exists!"
 msgstr ""
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:208
 #, php-format
-msgid "Migration failed for object %s, please check if it already exists!"
+msgid "Migration failed for object %s: please check if it already exists!"
 msgstr ""
 
 #: plugins/addons/propertyEditor/migrate.tpl:3
@@ -3149,7 +3079,7 @@ msgstr ""
 msgid "Dynamic object"
 msgstr "Object"
 
-#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:62
+#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:66
 msgid "The GOsa team"
 msgstr "Het GOsa team"
 
@@ -4533,6 +4463,11 @@ msgid ""
 "add the object class '%s' manually."
 msgstr ""
 
+#: setup/class_setup.inc:183
+#, fuzzy
+msgid "Setup"
+msgstr "Stel in"
+
 #: setup/class_setup.inc:195
 #, fuzzy
 msgid "Completed"
@@ -4762,15 +4697,7 @@ msgstr "Gebruik een SSL sessie"
 msgid "User information"
 msgstr "Persoonlijke informatie"
 
-#: ihtml/themes/default/infoPage.tpl:21
-msgid "Home phone"
-msgstr "Telefoon Privé"
-
-#: ihtml/themes/default/infoPage.tpl:27
-msgid "Organizational unit"
-msgstr "Afdeling"
-
-#: ihtml/themes/default/infoPage.tpl:51
+#: ihtml/themes/default/infoPage.tpl:55
 #, fuzzy
 msgid "Administrative contact"
 msgstr "Administratieve instellingen"
@@ -6433,7 +6360,7 @@ msgstr ""
 msgid ""
 "Enables event logging in GOsa. Setting it to 'On' make GOsa log every action "
 "a user performs via syslog. If you use this in combination with rsyslog and "
-"configure it to mysql logging, you can browse all events in GOsa."
+"configure it to MySQL logging, you can browse all events in GOsa."
 msgstr ""
 
 #: include/class_core.inc:279
@@ -7201,6 +7128,40 @@ msgstr ""
 msgid "Welcome to GOsa"
 msgstr "Welkom bij het GOsa installatie programma!"
 
+#, fuzzy
+#~ msgid "List of items"
+#~ msgstr "Lijst met gebruikers"
+
+#, fuzzy
+#~ msgid "Edit item"
+#~ msgstr "Bewerk certificaten"
+
+#, fuzzy
+#~ msgid "Remove item"
+#~ msgstr "Plaatje verwijderen"
+
+#, fuzzy
+#~ msgid "Container"
+#~ msgstr "Doorgaan"
+
+#, fuzzy
+#~ msgid "Config management"
+#~ msgstr "Systeembeheer"
+
+#, fuzzy
+#~ msgid "Distribution"
+#~ msgstr "Omschrijving"
+
+#, fuzzy
+#~ msgid "Component"
+#~ msgstr "Windows beheerders"
+
+#~ msgid "Home phone"
+#~ msgstr "Telefoon Privé"
+
+#~ msgid "Organizational unit"
+#~ msgstr "Afdeling"
+
 #, fuzzy
 #~ msgid "Max"
 #~ msgstr "Mei"

diff --git a/gosa-core/locale/core/pl/LC_MESSAGES/messages.po b/gosa-core/locale/core/pl/LC_MESSAGES/messages.po
index 82fd0f2d2cb773c65593e48feecfa460eb0f9d2d..e8903988350497ff55f98db62d931919ea975ed1 100644 (file)
--- a/gosa-core/locale/core/pl/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-01 15:07+0100\n"
+"POT-Creation-Date: 2010-12-01 16:21+0100\n"
 "PO-Revision-Date: 2010-04-30 21:15+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -21,7 +21,6 @@ msgstr ""
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml:21
 #: plugins/admin/groups/group-filter.xml:17
 #: plugins/admin/departments/dep-filter.xml:17
-#: plugins/admin/newConfigManagement/DeviceConfig-filter.xml:14
 #: plugins/admin/ogroups/ogroup-filter.xml:18
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.xml:32
 #: plugins/personal/posix/trustSelect/trust-filter.xml:17
@@ -106,7 +105,6 @@ msgstr "Pełniona funkcja"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:34
 #: plugins/admin/ogroups/ogroup-list.xml:41
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
 #: plugins/admin/ogroups/class_ogroup.inc:157
@@ -162,7 +160,6 @@ msgstr "Imię"
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:63
 #: plugins/admin/departments/class_domain.inc:91
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:42
 #: plugins/admin/ogroups/ogroup-list.xml:49
 #: plugins/admin/ogroups/generic.tpl:15
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
@@ -187,7 +184,6 @@ msgstr "Opis"
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/users/user-list.xml:78
 #: plugins/admin/groups/group-list.xml:62
 #: plugins/admin/departments/dep-list.xml:87
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:50
 #: plugins/admin/ogroups/ogroup-list.xml:62
 #: plugins/addons/propertyEditor/property-list.xml:96
 #: include/class_listing.inc:1183
@@ -207,7 +203,6 @@ msgstr "Utwórz"
 #: plugins/admin/groups/group-list.xml:98
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:64
 #: plugins/admin/ogroups/ogroup-list.xml:98
 #: plugins/personal/generic/generic_certs.tpl:22
 #: plugins/personal/generic/generic_certs.tpl:48
@@ -358,8 +353,6 @@ msgstr ""
 #: plugins/admin/groups/class_group.inc:758
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:94
 #: plugins/admin/ogroups/class_ogroup.inc:402
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:429
@@ -576,7 +569,7 @@ msgstr "Szablon"
 #: plugins/personal/generic/class_user.inc:1703
 #: plugins/personal/generic/class_user.inc:1857
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:15
+#: ihtml/themes/default/infoPage.tpl:19
 msgid "Given name"
 msgstr "Imię"
 
@@ -634,7 +627,7 @@ msgstr "Edytuj właściwości UNIX"
 #: plugins/admin/groups/class_groupManagement.inc:165
 #: plugins/admin/ogroups/tabs_ogroups.inc:155
 #: plugins/generic/infoPage/class_infoPage.inc:112
-#: ihtml/themes/default/infoPage.tpl:20
+#: ihtml/themes/default/infoPage.tpl:24
 msgid "Mail"
 msgstr "Poczta"
 
@@ -829,7 +822,7 @@ msgstr "Użytkownik"
 #: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/generic/class_user.inc:1702
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:14
+#: ihtml/themes/default/infoPage.tpl:18
 msgid "Surname"
 msgstr "Nazwisko"
 
@@ -1431,7 +1424,7 @@ msgstr "Stan"
 #: plugins/admin/departments/generic.tpl:95
 #: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/class_user.inc:1734
-#: ihtml/themes/default/infoPage.tpl:28
+#: ihtml/themes/default/infoPage.tpl:32
 msgid "Location"
 msgstr "Lokalizacja"
 
@@ -1492,6 +1485,7 @@ msgstr ""
 
 #: plugins/admin/departments/dep-filter.xml:35
 #: plugins/admin/departments/generic.tpl:4
+#: ihtml/themes/default/infoPage.tpl:31
 msgid "Organizational Unit"
 msgstr "Jednostka organizacyjna"
 
@@ -1504,7 +1498,7 @@ msgstr "Jednostka organizacyjna"
 #: plugins/admin/departments/class_departmentManagement.inc:241
 #: plugins/personal/generic/generic.tpl:298
 #: plugins/personal/generic/class_user.inc:1720 setup/setup_feedback.tpl:10
-#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:26
+#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:30
 msgid "Organization"
 msgstr "Organizacja"
 
@@ -1635,68 +1629,6 @@ msgid ""
 "management dialog."
 msgstr ""
 
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:10
-#, fuzzy
-msgid "List of items"
-msgstr "Lista użytkowników"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:75
-#, fuzzy
-msgid "Edit item"
-msgstr "Edytuj filtry"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:82
-#, fuzzy
-msgid "Remove item"
-msgstr "Usuń obrazek"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:9
-#, fuzzy
-msgid "Container"
-msgstr "Kontynuuj"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:10
-msgid "Item"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:8
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:9
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:352
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:353
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:359
-#, fuzzy
-msgid "Config management"
-msgstr "Zarządzanie systemem"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:95
-#, php-format
-msgid "Failed to load distributions, error was '%s'!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:262
-msgid "No selectable install methods returned!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:263
-#: setup/class_setup.inc:183
-msgid "Setup"
-msgstr "Ustawienia"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:278
-#, fuzzy
-msgid "Distribution"
-msgstr "Opis"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:284
-msgid "Release"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:290
-#, fuzzy
-msgid "Component"
-msgstr "Komponent Domeny"
-
 #: plugins/admin/ogroups/paste_generic.tpl:1
 #, fuzzy
 msgid "Paste object group"
@@ -1708,9 +1640,7 @@ msgid "Please enter the new object group name"
 msgstr "Proszę podać nową nazwę."
 
 #: plugins/admin/ogroups/paste_generic.tpl:16
-msgid ""
-"Copy members. Be careful with this option, systems can only inherit from a "
-"single object group!"
+msgid "Warning: systems can only inherit from a single object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup-list.xml:11
@@ -2081,7 +2011,7 @@ msgid "Shell"
 msgstr "Shell"
 
 #: plugins/personal/posix/class_posixAccount.inc:1310
-#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:13
+#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:17
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
@@ -2282,7 +2212,7 @@ msgid "Your password hash method will not be changed!"
 msgstr "Twoje hasło zostało pomyślnie zmienione."
 
 #: plugins/personal/generic/paste_generic.tpl:1
-#: ihtml/themes/default/infoPage.tpl:44
+#: ihtml/themes/default/infoPage.tpl:48
 msgid "User settings"
 msgstr "Ustawienia użytkownika"
 
@@ -2377,20 +2307,20 @@ msgstr "Nazwa Szablonu"
 
 #: plugins/personal/generic/generic.tpl:92
 #: plugins/personal/generic/class_user.inc:1708
-#: ihtml/themes/default/infoPage.tpl:16
+#: ihtml/themes/default/infoPage.tpl:20
 msgid "Personal title"
 msgstr "Osobisty tytuł"
 
 #: plugins/personal/generic/generic.tpl:102
 #: plugins/personal/generic/class_user.inc:1709
-#: ihtml/themes/default/infoPage.tpl:17
+#: ihtml/themes/default/infoPage.tpl:21
 msgid "Academic title"
 msgstr "Tytuł naukowy"
 
 #: plugins/personal/generic/generic.tpl:117
 #: plugins/personal/generic/class_user.inc:1368
 #: plugins/personal/generic/class_user.inc:1711
-#: ihtml/themes/default/infoPage.tpl:19
+#: ihtml/themes/default/infoPage.tpl:23
 msgid "Date of birth"
 msgstr "Data urodzenia"
 
@@ -2466,7 +2396,7 @@ msgstr "Numer pracownika"
 
 #: plugins/personal/generic/generic.tpl:330
 #: plugins/personal/generic/class_user.inc:1725
-#: ihtml/themes/default/infoPage.tpl:33
+#: ihtml/themes/default/infoPage.tpl:37
 msgid "Employee type"
 msgstr "Typ pracownika"
 
@@ -2519,7 +2449,7 @@ msgstr "Jednostka"
 
 #: plugins/personal/generic/generic.tpl:535
 #: plugins/personal/generic/class_user.inc:1665
-#: ihtml/themes/default/infoPage.tpl:29
+#: ihtml/themes/default/infoPage.tpl:33
 msgid "Street"
 msgstr "Ulica"
 
@@ -2617,7 +2547,7 @@ msgstr "Ta aplikacja nie jest już dostępna."
 
 #: plugins/personal/generic/class_user.inc:1051
 msgid ""
-"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-"
 "imagick' to be installed!"
 msgstr ""
 
@@ -2662,12 +2592,12 @@ msgid "Login restrictions"
 msgstr "Hasło wygasa"
 
 #: plugins/personal/generic/class_user.inc:1722
-#: ihtml/themes/default/infoPage.tpl:30
+#: ihtml/themes/default/infoPage.tpl:34
 msgid "Department number"
 msgstr "Numer departamentu"
 
 #: plugins/personal/generic/class_user.inc:1724
-#: ihtml/themes/default/infoPage.tpl:32
+#: ihtml/themes/default/infoPage.tpl:36
 msgid "Employee number"
 msgstr "Numer pracownika"
 
@@ -2693,11 +2623,12 @@ msgid "Fax number"
 msgstr "Numer fax"
 
 #: plugins/personal/generic/class_user.inc:1737
-#: ihtml/themes/default/infoPage.tpl:18
+#: ihtml/themes/default/infoPage.tpl:22
 msgid "Home postal address"
 msgstr "Adres domowy"
 
 #: plugins/personal/generic/class_user.inc:1738
+#: ihtml/themes/default/infoPage.tpl:25
 msgid "Home phone number"
 msgstr "Numer telefonu domowego"
 
@@ -2944,12 +2875,12 @@ msgstr "Migruj"
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:204
 #, php-format
-msgid "Migration failed for object %s, dn already exists!"
+msgid "Migration failed for object %s: DN already exists!"
 msgstr ""
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:208
 #, php-format
-msgid "Migration failed for object %s, please check if it already exists!"
+msgid "Migration failed for object %s: please check if it already exists!"
 msgstr ""
 
 #: plugins/addons/propertyEditor/migrate.tpl:3
@@ -3054,7 +2985,7 @@ msgstr ""
 msgid "Dynamic object"
 msgstr "Obiekt GOsa"
 
-#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:62
+#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:66
 msgid "The GOsa team"
 msgstr "Zespół GOsa"
 
@@ -4391,6 +4322,10 @@ msgid ""
 "add the object class '%s' manually."
 msgstr ""
 
+#: setup/class_setup.inc:183
+msgid "Setup"
+msgstr "Ustawienia"
+
 #: setup/class_setup.inc:195
 msgid "Completed"
 msgstr "Zakończono"
@@ -4607,15 +4542,7 @@ msgstr "Sprowadź sesję SSL"
 msgid "User information"
 msgstr "pokaż informacje"
 
-#: ihtml/themes/default/infoPage.tpl:21
-msgid "Home phone"
-msgstr "Telefon domowy"
-
-#: ihtml/themes/default/infoPage.tpl:27
-msgid "Organizational unit"
-msgstr "Jednostka organizacyjna"
-
-#: ihtml/themes/default/infoPage.tpl:51
+#: ihtml/themes/default/infoPage.tpl:55
 #, fuzzy
 msgid "Administrative contact"
 msgstr "Ustawienia administracyjne"
@@ -6223,7 +6150,7 @@ msgstr ""
 msgid ""
 "Enables event logging in GOsa. Setting it to 'On' make GOsa log every action "
 "a user performs via syslog. If you use this in combination with rsyslog and "
-"configure it to mysql logging, you can browse all events in GOsa."
+"configure it to MySQL logging, you can browse all events in GOsa."
 msgstr ""
 
 #: include/class_core.inc:279
@@ -6980,6 +6907,40 @@ msgstr ""
 msgid "Welcome to GOsa"
 msgstr "Witaj w GOsa"
 
+#, fuzzy
+#~ msgid "List of items"
+#~ msgstr "Lista użytkowników"
+
+#, fuzzy
+#~ msgid "Edit item"
+#~ msgstr "Edytuj filtry"
+
+#, fuzzy
+#~ msgid "Remove item"
+#~ msgstr "Usuń obrazek"
+
+#, fuzzy
+#~ msgid "Container"
+#~ msgstr "Kontynuuj"
+
+#, fuzzy
+#~ msgid "Config management"
+#~ msgstr "Zarządzanie systemem"
+
+#, fuzzy
+#~ msgid "Distribution"
+#~ msgstr "Opis"
+
+#, fuzzy
+#~ msgid "Component"
+#~ msgstr "Komponent Domeny"
+
+#~ msgid "Home phone"
+#~ msgstr "Telefon domowy"
+
+#~ msgid "Organizational unit"
+#~ msgstr "Jednostka organizacyjna"
+
 #, fuzzy
 #~ msgid "Max"
 #~ msgstr "Maj"

diff --git a/gosa-core/locale/core/pt/LC_MESSAGES/messages.po b/gosa-core/locale/core/pt/LC_MESSAGES/messages.po
index 174d829ad60b550938703052047fa071b5afad26..01a81d066d1d6fc1e1ccd780c56e17a4db23ac7e 100644 (file)
--- a/gosa-core/locale/core/pt/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/pt/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages-2.6.4-pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-01 15:07+0100\n"
+"POT-Creation-Date: 2010-12-01 16:21+0100\n"
 "PO-Revision-Date: 2009-03-02 15:03-0300\n"
 "Last-Translator: Clever de Oliveira Jr. <clever@dri.cefetmg.br>\n"
 "Language-Team: Brazilian Portuguese <pt@li.org>\n"
@@ -23,7 +23,6 @@ msgstr ""
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml:21
 #: plugins/admin/groups/group-filter.xml:17
 #: plugins/admin/departments/dep-filter.xml:17
-#: plugins/admin/newConfigManagement/DeviceConfig-filter.xml:14
 #: plugins/admin/ogroups/ogroup-filter.xml:18
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.xml:32
 #: plugins/personal/posix/trustSelect/trust-filter.xml:17
@@ -107,7 +106,6 @@ msgstr "Papel"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:34
 #: plugins/admin/ogroups/ogroup-list.xml:41
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
 #: plugins/admin/ogroups/class_ogroup.inc:157
@@ -163,7 +161,6 @@ msgstr "Nome"
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:63
 #: plugins/admin/departments/class_domain.inc:91
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:42
 #: plugins/admin/ogroups/ogroup-list.xml:49
 #: plugins/admin/ogroups/generic.tpl:15
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
@@ -188,7 +185,6 @@ msgstr "Descrição"
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/users/user-list.xml:78
 #: plugins/admin/groups/group-list.xml:62
 #: plugins/admin/departments/dep-list.xml:87
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:50
 #: plugins/admin/ogroups/ogroup-list.xml:62
 #: plugins/addons/propertyEditor/property-list.xml:96
 #: include/class_listing.inc:1183
@@ -208,7 +204,6 @@ msgstr "Criar"
 #: plugins/admin/groups/group-list.xml:98
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:64
 #: plugins/admin/ogroups/ogroup-list.xml:98
 #: plugins/personal/generic/generic_certs.tpl:22
 #: plugins/personal/generic/generic_certs.tpl:48
@@ -355,8 +350,6 @@ msgstr ""
 #: plugins/admin/groups/class_group.inc:758
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:94
 #: plugins/admin/ogroups/class_ogroup.inc:402
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:429
@@ -570,7 +563,7 @@ msgstr "Modelo"
 #: plugins/personal/generic/class_user.inc:1703
 #: plugins/personal/generic/class_user.inc:1857
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:15
+#: ihtml/themes/default/infoPage.tpl:19
 msgid "Given name"
 msgstr "Nome fornecido"
 
@@ -630,7 +623,7 @@ msgstr "Editar propriedades UNIX"
 #: plugins/admin/groups/class_groupManagement.inc:165
 #: plugins/admin/ogroups/tabs_ogroups.inc:155
 #: plugins/generic/infoPage/class_infoPage.inc:112
-#: ihtml/themes/default/infoPage.tpl:20
+#: ihtml/themes/default/infoPage.tpl:24
 msgid "Mail"
 msgstr "Correio"
 
@@ -824,7 +817,7 @@ msgstr "Usuário"
 #: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/generic/class_user.inc:1702
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:14
+#: ihtml/themes/default/infoPage.tpl:18
 msgid "Surname"
 msgstr "Sobrenome"
 
@@ -1419,7 +1412,7 @@ msgstr "Estado"
 #: plugins/admin/departments/generic.tpl:95
 #: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/class_user.inc:1734
-#: ihtml/themes/default/infoPage.tpl:28
+#: ihtml/themes/default/infoPage.tpl:32
 msgid "Location"
 msgstr "Localização"
 
@@ -1480,6 +1473,7 @@ msgstr ""
 
 #: plugins/admin/departments/dep-filter.xml:35
 #: plugins/admin/departments/generic.tpl:4
+#: ihtml/themes/default/infoPage.tpl:31
 #, fuzzy
 msgid "Organizational Unit"
 msgstr "Organização"
@@ -1493,7 +1487,7 @@ msgstr "Organização"
 #: plugins/admin/departments/class_departmentManagement.inc:241
 #: plugins/personal/generic/generic.tpl:298
 #: plugins/personal/generic/class_user.inc:1720 setup/setup_feedback.tpl:10
-#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:26
+#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:30
 msgid "Organization"
 msgstr "Organização"
 
@@ -1618,68 +1612,6 @@ msgid ""
 "management dialog."
 msgstr ""
 
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:10
-#, fuzzy
-msgid "List of items"
-msgstr "Lista de usuários"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:75
-#, fuzzy
-msgid "Edit item"
-msgstr "Editar certificados"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:82
-#, fuzzy
-msgid "Remove item"
-msgstr "Remover foto"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:9
-#, fuzzy
-msgid "Container"
-msgstr "Continuar"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:10
-msgid "Item"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:8
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:9
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:352
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:353
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:359
-#, fuzzy
-msgid "Config management"
-msgstr "Erro de configuração"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:95
-#, php-format
-msgid "Failed to load distributions, error was '%s'!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:262
-msgid "No selectable install methods returned!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:263
-#: setup/class_setup.inc:183
-msgid "Setup"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:278
-#, fuzzy
-msgid "Distribution"
-msgstr "Descrição"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:284
-msgid "Release"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:290
-#, fuzzy
-msgid "Component"
-msgstr "Administradores do domínio"
-
 #: plugins/admin/ogroups/paste_generic.tpl:1
 #, fuzzy
 msgid "Paste object group"
@@ -1690,9 +1622,7 @@ msgid "Please enter the new object group name"
 msgstr ""
 
 #: plugins/admin/ogroups/paste_generic.tpl:16
-msgid ""
-"Copy members. Be careful with this option, systems can only inherit from a "
-"single object group!"
+msgid "Warning: systems can only inherit from a single object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup-list.xml:11
@@ -2061,7 +1991,7 @@ msgid "Shell"
 msgstr "Shell"
 
 #: plugins/personal/posix/class_posixAccount.inc:1310
-#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:13
+#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:17
 msgid "User ID"
 msgstr "ID do usuário"
 
@@ -2259,7 +2189,7 @@ msgid "Your password hash method will not be changed!"
 msgstr "Sua senha foi alterada com sucesso."
 
 #: plugins/personal/generic/paste_generic.tpl:1
-#: ihtml/themes/default/infoPage.tpl:44
+#: ihtml/themes/default/infoPage.tpl:48
 msgid "User settings"
 msgstr "Configurações do usuário"
 
@@ -2355,20 +2285,20 @@ msgstr "Nome modelo"
 
 #: plugins/personal/generic/generic.tpl:92
 #: plugins/personal/generic/class_user.inc:1708
-#: ihtml/themes/default/infoPage.tpl:16
+#: ihtml/themes/default/infoPage.tpl:20
 msgid "Personal title"
 msgstr "Título pessoal"
 
 #: plugins/personal/generic/generic.tpl:102
 #: plugins/personal/generic/class_user.inc:1709
-#: ihtml/themes/default/infoPage.tpl:17
+#: ihtml/themes/default/infoPage.tpl:21
 msgid "Academic title"
 msgstr "Título acadêmico"
 
 #: plugins/personal/generic/generic.tpl:117
 #: plugins/personal/generic/class_user.inc:1368
 #: plugins/personal/generic/class_user.inc:1711
-#: ihtml/themes/default/infoPage.tpl:19
+#: ihtml/themes/default/infoPage.tpl:23
 msgid "Date of birth"
 msgstr "Data de nascimento"
 
@@ -2444,7 +2374,7 @@ msgstr "Nº do empregado"
 
 #: plugins/personal/generic/generic.tpl:330
 #: plugins/personal/generic/class_user.inc:1725
-#: ihtml/themes/default/infoPage.tpl:33
+#: ihtml/themes/default/infoPage.tpl:37
 msgid "Employee type"
 msgstr "Tipo de empregado"
 
@@ -2497,7 +2427,7 @@ msgstr "Unidade"
 
 #: plugins/personal/generic/generic.tpl:535
 #: plugins/personal/generic/class_user.inc:1665
-#: ihtml/themes/default/infoPage.tpl:29
+#: ihtml/themes/default/infoPage.tpl:33
 msgid "Street"
 msgstr "Rua"
 
@@ -2593,7 +2523,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1051
 msgid ""
-"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-"
 "imagick' to be installed!"
 msgstr ""
 
@@ -2637,12 +2567,12 @@ msgid "Login restrictions"
 msgstr "Estações de Trabalho"
 
 #: plugins/personal/generic/class_user.inc:1722
-#: ihtml/themes/default/infoPage.tpl:30
+#: ihtml/themes/default/infoPage.tpl:34
 msgid "Department number"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1724
-#: ihtml/themes/default/infoPage.tpl:32
+#: ihtml/themes/default/infoPage.tpl:36
 msgid "Employee number"
 msgstr ""
 
@@ -2668,11 +2598,12 @@ msgid "Fax number"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1737
-#: ihtml/themes/default/infoPage.tpl:18
+#: ihtml/themes/default/infoPage.tpl:22
 msgid "Home postal address"
 msgstr "Caixa postal residencial"
 
 #: plugins/personal/generic/class_user.inc:1738
+#: ihtml/themes/default/infoPage.tpl:25
 msgid "Home phone number"
 msgstr ""
 
@@ -2910,12 +2841,12 @@ msgstr ""
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:204
 #, php-format
-msgid "Migration failed for object %s, dn already exists!"
+msgid "Migration failed for object %s: DN already exists!"
 msgstr ""
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:208
 #, php-format
-msgid "Migration failed for object %s, please check if it already exists!"
+msgid "Migration failed for object %s: please check if it already exists!"
 msgstr ""
 
 #: plugins/addons/propertyEditor/migrate.tpl:3
@@ -3017,7 +2948,7 @@ msgstr ""
 msgid "Dynamic object"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:62
+#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:66
 msgid "The GOsa team"
 msgstr ""
 
@@ -4261,6 +4192,10 @@ msgid ""
 "add the object class '%s' manually."
 msgstr ""
 
+#: setup/class_setup.inc:183
+msgid "Setup"
+msgstr ""
+
 #: setup/class_setup.inc:195
 msgid "Completed"
 msgstr ""
@@ -4470,17 +4405,7 @@ msgstr "Entre com a sessão SSL"
 msgid "User information"
 msgstr "Informação pessoal"
 
-#: ihtml/themes/default/infoPage.tpl:21
-#, fuzzy
-msgid "Home phone"
-msgstr "Modelos"
-
-#: ihtml/themes/default/infoPage.tpl:27
-#, fuzzy
-msgid "Organizational unit"
-msgstr "Organização"
-
-#: ihtml/themes/default/infoPage.tpl:51
+#: ihtml/themes/default/infoPage.tpl:55
 #, fuzzy
 msgid "Administrative contact"
 msgstr "Administração de usuários"
@@ -6027,7 +5952,7 @@ msgstr ""
 msgid ""
 "Enables event logging in GOsa. Setting it to 'On' make GOsa log every action "
 "a user performs via syslog. If you use this in combination with rsyslog and "
-"configure it to mysql logging, you can browse all events in GOsa."
+"configure it to MySQL logging, you can browse all events in GOsa."
 msgstr ""
 
 #: include/class_core.inc:279
@@ -6770,6 +6695,42 @@ msgstr ""
 msgid "Welcome to GOsa"
 msgstr "Bem vindo %s!"
 
+#, fuzzy
+#~ msgid "List of items"
+#~ msgstr "Lista de usuários"
+
+#, fuzzy
+#~ msgid "Edit item"
+#~ msgstr "Editar certificados"
+
+#, fuzzy
+#~ msgid "Remove item"
+#~ msgstr "Remover foto"
+
+#, fuzzy
+#~ msgid "Container"
+#~ msgstr "Continuar"
+
+#, fuzzy
+#~ msgid "Config management"
+#~ msgstr "Erro de configuração"
+
+#, fuzzy
+#~ msgid "Distribution"
+#~ msgstr "Descrição"
+
+#, fuzzy
+#~ msgid "Component"
+#~ msgstr "Administradores do domínio"
+
+#, fuzzy
+#~ msgid "Home phone"
+#~ msgstr "Modelos"
+
+#, fuzzy
+#~ msgid "Organizational unit"
+#~ msgstr "Organização"
+
 #, fuzzy
 #~ msgid "Max"
 #~ msgstr "Maio"

diff --git a/gosa-core/locale/core/pt_BR/LC_MESSAGES/messages.po b/gosa-core/locale/core/pt_BR/LC_MESSAGES/messages.po
index f8969615e987102b94c4e2c26e0462dc87eee38c..237a305aa9e3da8cd5b722b9da57993a95d4294d 100644 (file)
--- a/gosa-core/locale/core/pt_BR/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/pt_BR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GOsa core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-01 15:07+0100\n"
+"POT-Creation-Date: 2010-12-01 16:21+0100\n"
 "PO-Revision-Date: 2010-03-12 14:48-0300\n"
 "Last-Translator: Marcos Amorim <marcosmamorim@gmail.com>\n"
 "Language-Team: Marcos Amorim <marcosmamorim@gmail.com> Clever de Oliveira "
@@ -25,7 +25,6 @@ msgstr ""
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml:21
 #: plugins/admin/groups/group-filter.xml:17
 #: plugins/admin/departments/dep-filter.xml:17
-#: plugins/admin/newConfigManagement/DeviceConfig-filter.xml:14
 #: plugins/admin/ogroups/ogroup-filter.xml:18
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.xml:32
 #: plugins/personal/posix/trustSelect/trust-filter.xml:17
@@ -109,7 +108,6 @@ msgstr "Papéis"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:34
 #: plugins/admin/ogroups/ogroup-list.xml:41
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
 #: plugins/admin/ogroups/class_ogroup.inc:157
@@ -165,7 +163,6 @@ msgstr "Nome"
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:63
 #: plugins/admin/departments/class_domain.inc:91
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:42
 #: plugins/admin/ogroups/ogroup-list.xml:49
 #: plugins/admin/ogroups/generic.tpl:15
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
@@ -190,7 +187,6 @@ msgstr "Descrição"
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/users/user-list.xml:78
 #: plugins/admin/groups/group-list.xml:62
 #: plugins/admin/departments/dep-list.xml:87
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:50
 #: plugins/admin/ogroups/ogroup-list.xml:62
 #: plugins/addons/propertyEditor/property-list.xml:96
 #: include/class_listing.inc:1183
@@ -210,7 +206,6 @@ msgstr "Criar"
 #: plugins/admin/groups/group-list.xml:98
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:64
 #: plugins/admin/ogroups/ogroup-list.xml:98
 #: plugins/personal/generic/generic_certs.tpl:22
 #: plugins/personal/generic/generic_certs.tpl:48
@@ -362,8 +357,6 @@ msgstr ""
 #: plugins/admin/groups/class_group.inc:758
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:94
 #: plugins/admin/ogroups/class_ogroup.inc:402
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:429
@@ -580,7 +573,7 @@ msgstr "Modelo"
 #: plugins/personal/generic/class_user.inc:1703
 #: plugins/personal/generic/class_user.inc:1857
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:15
+#: ihtml/themes/default/infoPage.tpl:19
 #, fuzzy
 msgid "Given name"
 msgstr "Primeiro Nome"
@@ -641,7 +634,7 @@ msgstr "Editar propriedades POSIX"
 #: plugins/admin/groups/class_groupManagement.inc:165
 #: plugins/admin/ogroups/tabs_ogroups.inc:155
 #: plugins/generic/infoPage/class_infoPage.inc:112
-#: ihtml/themes/default/infoPage.tpl:20
+#: ihtml/themes/default/infoPage.tpl:24
 msgid "Mail"
 msgstr "Email"
 
@@ -837,7 +830,7 @@ msgstr "Usuário"
 #: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/generic/class_user.inc:1702
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:14
+#: ihtml/themes/default/infoPage.tpl:18
 msgid "Surname"
 msgstr "Sobrenome"
 
@@ -1434,7 +1427,7 @@ msgstr "Estado"
 #: plugins/admin/departments/generic.tpl:95
 #: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/class_user.inc:1734
-#: ihtml/themes/default/infoPage.tpl:28
+#: ihtml/themes/default/infoPage.tpl:32
 msgid "Location"
 msgstr "Localização"
 
@@ -1501,6 +1494,7 @@ msgstr ""
 
 #: plugins/admin/departments/dep-filter.xml:35
 #: plugins/admin/departments/generic.tpl:4
+#: ihtml/themes/default/infoPage.tpl:31
 #, fuzzy
 msgid "Organizational Unit"
 msgstr "Nome da Empresa"
@@ -1514,7 +1508,7 @@ msgstr "Nome da Empresa"
 #: plugins/admin/departments/class_departmentManagement.inc:241
 #: plugins/personal/generic/generic.tpl:298
 #: plugins/personal/generic/class_user.inc:1720 setup/setup_feedback.tpl:10
-#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:26
+#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:30
 msgid "Organization"
 msgstr "Empresa"
 
@@ -1647,68 +1641,6 @@ msgstr ""
 "página e pressione o botão 'Continuar' para continuar com o diálogo de "
 "gestão do departamento."
 
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:10
-#, fuzzy
-msgid "List of items"
-msgstr "Lista de usuários"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:75
-#, fuzzy
-msgid "Edit item"
-msgstr "Editar certificados"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:82
-#, fuzzy
-msgid "Remove item"
-msgstr "Remover foto"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:9
-#, fuzzy
-msgid "Container"
-msgstr "Continuar"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:10
-msgid "Item"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:8
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:9
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:352
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:353
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:359
-#, fuzzy
-msgid "Config management"
-msgstr "Sistema/Gerenciamento de Configurações"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:95
-#, php-format
-msgid "Failed to load distributions, error was '%s'!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:262
-msgid "No selectable install methods returned!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:263
-#: setup/class_setup.inc:183
-msgid "Setup"
-msgstr "Configuração"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:278
-#, fuzzy
-msgid "Distribution"
-msgstr "Descrição"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:284
-msgid "Release"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:290
-#, fuzzy
-msgid "Component"
-msgstr "Componente do domínio"
-
 #: plugins/admin/ogroups/paste_generic.tpl:1
 #, fuzzy
 msgid "Paste object group"
@@ -1719,9 +1651,7 @@ msgid "Please enter the new object group name"
 msgstr "Por favor entre com o nome do novo grupo de objeto"
 
 #: plugins/admin/ogroups/paste_generic.tpl:16
-msgid ""
-"Copy members. Be careful with this option, systems can only inherit from a "
-"single object group!"
+msgid "Warning: systems can only inherit from a single object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup-list.xml:11
@@ -2104,7 +2034,7 @@ msgid "Shell"
 msgstr "Shell"
 
 #: plugins/personal/posix/class_posixAccount.inc:1310
-#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:13
+#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:17
 msgid "User ID"
 msgstr "ID do usuário"
 
@@ -2310,7 +2240,7 @@ msgid "Your password hash method will not be changed!"
 msgstr "Sua senha foi alterada com sucesso."
 
 #: plugins/personal/generic/paste_generic.tpl:1
-#: ihtml/themes/default/infoPage.tpl:44
+#: ihtml/themes/default/infoPage.tpl:48
 msgid "User settings"
 msgstr "Configurações do usuário"
 
@@ -2406,20 +2336,20 @@ msgstr "Nome do modelo"
 
 #: plugins/personal/generic/generic.tpl:92
 #: plugins/personal/generic/class_user.inc:1708
-#: ihtml/themes/default/infoPage.tpl:16
+#: ihtml/themes/default/infoPage.tpl:20
 msgid "Personal title"
 msgstr "Título pessoal"
 
 #: plugins/personal/generic/generic.tpl:102
 #: plugins/personal/generic/class_user.inc:1709
-#: ihtml/themes/default/infoPage.tpl:17
+#: ihtml/themes/default/infoPage.tpl:21
 msgid "Academic title"
 msgstr "Título acadêmico"
 
 #: plugins/personal/generic/generic.tpl:117
 #: plugins/personal/generic/class_user.inc:1368
 #: plugins/personal/generic/class_user.inc:1711
-#: ihtml/themes/default/infoPage.tpl:19
+#: ihtml/themes/default/infoPage.tpl:23
 msgid "Date of birth"
 msgstr "Data de nascimento"
 
@@ -2496,7 +2426,7 @@ msgstr "No. de Funcionário"
 
 #: plugins/personal/generic/generic.tpl:330
 #: plugins/personal/generic/class_user.inc:1725
-#: ihtml/themes/default/infoPage.tpl:33
+#: ihtml/themes/default/infoPage.tpl:37
 msgid "Employee type"
 msgstr "Tipo de funcionário"
 
@@ -2550,7 +2480,7 @@ msgstr "Unidade"
 
 #: plugins/personal/generic/generic.tpl:535
 #: plugins/personal/generic/class_user.inc:1665
-#: ihtml/themes/default/infoPage.tpl:29
+#: ihtml/themes/default/infoPage.tpl:33
 msgid "Street"
 msgstr "Rua"
 
@@ -2653,7 +2583,7 @@ msgstr "O método de senha selecionado não esta mais disponível."
 
 #: plugins/personal/generic/class_user.inc:1051
 msgid ""
-"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-"
 "imagick' to be installed!"
 msgstr ""
 
@@ -2697,12 +2627,12 @@ msgid "Login restrictions"
 msgstr "Restrições de login"
 
 #: plugins/personal/generic/class_user.inc:1722
-#: ihtml/themes/default/infoPage.tpl:30
+#: ihtml/themes/default/infoPage.tpl:34
 msgid "Department number"
 msgstr "Número do departamento"
 
 #: plugins/personal/generic/class_user.inc:1724
-#: ihtml/themes/default/infoPage.tpl:32
+#: ihtml/themes/default/infoPage.tpl:36
 msgid "Employee number"
 msgstr "Registro de funcionário"
 
@@ -2728,11 +2658,12 @@ msgid "Fax number"
 msgstr "Número do Fax"
 
 #: plugins/personal/generic/class_user.inc:1737
-#: ihtml/themes/default/infoPage.tpl:18
+#: ihtml/themes/default/infoPage.tpl:22
 msgid "Home postal address"
 msgstr "Endereço residêncial"
 
 #: plugins/personal/generic/class_user.inc:1738
+#: ihtml/themes/default/infoPage.tpl:25
 msgid "Home phone number"
 msgstr "Telefone residêncial"
 
@@ -2978,13 +2909,13 @@ msgstr "Migrar"
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:204
 #, fuzzy, php-format
-msgid "Migration failed for object %s, dn already exists!"
+msgid "Migration failed for object %s: DN already exists!"
 msgstr "Falha ao adicionar um usuário administrativo: o objeto '%s' já existe!"
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:208
-#, php-format
-msgid "Migration failed for object %s, please check if it already exists!"
-msgstr ""
+#, fuzzy, php-format
+msgid "Migration failed for object %s: please check if it already exists!"
+msgstr "Falha ao adicionar um usuário administrativo: o objeto '%s' já existe!"
 
 #: plugins/addons/propertyEditor/migrate.tpl:3
 msgid "Property migration assistant"
@@ -3087,7 +3018,7 @@ msgstr ""
 msgid "Dynamic object"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:62
+#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:66
 msgid "The GOsa team"
 msgstr "A equipe GOsa"
 
@@ -4435,6 +4366,10 @@ msgstr ""
 "Não pode lidar com o tipo de objeto estrutura do seu objeto raiz. Por favor "
 "tente adicionar a classe de objeto '%s' manualmente."
 
+#: setup/class_setup.inc:183
+msgid "Setup"
+msgstr "Configuração"
+
 #: setup/class_setup.inc:195
 msgid "Completed"
 msgstr "Concluído"
@@ -4673,17 +4608,7 @@ msgstr "Entrar sessão com SSL"
 msgid "User information"
 msgstr "exibir informações"
 
-#: ihtml/themes/default/infoPage.tpl:21
-#, fuzzy
-msgid "Home phone"
-msgstr "Telefone residêncial"
-
-#: ihtml/themes/default/infoPage.tpl:27
-#, fuzzy
-msgid "Organizational unit"
-msgstr "Nome da Empresa"
-
-#: ihtml/themes/default/infoPage.tpl:51
+#: ihtml/themes/default/infoPage.tpl:55
 #, fuzzy
 msgid "Administrative contact"
 msgstr "Configurações administrativas"
@@ -6316,7 +6241,7 @@ msgstr ""
 msgid ""
 "Enables event logging in GOsa. Setting it to 'On' make GOsa log every action "
 "a user performs via syslog. If you use this in combination with rsyslog and "
-"configure it to mysql logging, you can browse all events in GOsa."
+"configure it to MySQL logging, you can browse all events in GOsa."
 msgstr ""
 
 #: include/class_core.inc:279
@@ -7091,6 +7016,42 @@ msgstr ""
 msgid "Welcome to GOsa"
 msgstr "Bem-vindo ao assistente de configuração do GOsa"
 
+#, fuzzy
+#~ msgid "List of items"
+#~ msgstr "Lista de usuários"
+
+#, fuzzy
+#~ msgid "Edit item"
+#~ msgstr "Editar certificados"
+
+#, fuzzy
+#~ msgid "Remove item"
+#~ msgstr "Remover foto"
+
+#, fuzzy
+#~ msgid "Container"
+#~ msgstr "Continuar"
+
+#, fuzzy
+#~ msgid "Config management"
+#~ msgstr "Sistema/Gerenciamento de Configurações"
+
+#, fuzzy
+#~ msgid "Distribution"
+#~ msgstr "Descrição"
+
+#, fuzzy
+#~ msgid "Component"
+#~ msgstr "Componente do domínio"
+
+#, fuzzy
+#~ msgid "Home phone"
+#~ msgstr "Telefone residêncial"
+
+#, fuzzy
+#~ msgid "Organizational unit"
+#~ msgstr "Nome da Empresa"
+
 #, fuzzy
 #~ msgid "Max"
 #~ msgstr "Maio"

diff --git a/gosa-core/locale/core/ru/LC_MESSAGES/messages.po b/gosa-core/locale/core/ru/LC_MESSAGES/messages.po
index fee42a2d83300e78ca720cd3668b9cdd9700622c..5689a1a06425546b4a692a6c15f27053a84aff20 100644 (file)
--- a/gosa-core/locale/core/ru/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-01 15:07+0100\n"
+"POT-Creation-Date: 2010-12-01 16:21+0100\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"
@@ -21,7 +21,6 @@ msgstr ""
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml:21
 #: plugins/admin/groups/group-filter.xml:17
 #: plugins/admin/departments/dep-filter.xml:17
-#: plugins/admin/newConfigManagement/DeviceConfig-filter.xml:14
 #: plugins/admin/ogroups/ogroup-filter.xml:18
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.xml:32
 #: plugins/personal/posix/trustSelect/trust-filter.xml:17
@@ -107,7 +106,6 @@ msgstr "Роль"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:34
 #: plugins/admin/ogroups/ogroup-list.xml:41
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
 #: plugins/admin/ogroups/class_ogroup.inc:157
@@ -163,7 +161,6 @@ msgstr "Фамилия"
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:63
 #: plugins/admin/departments/class_domain.inc:91
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:42
 #: plugins/admin/ogroups/ogroup-list.xml:49
 #: plugins/admin/ogroups/generic.tpl:15
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
@@ -188,7 +185,6 @@ msgstr "Описание"
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/users/user-list.xml:78
 #: plugins/admin/groups/group-list.xml:62
 #: plugins/admin/departments/dep-list.xml:87
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:50
 #: plugins/admin/ogroups/ogroup-list.xml:62
 #: plugins/addons/propertyEditor/property-list.xml:96
 #: include/class_listing.inc:1183
@@ -208,7 +204,6 @@ msgstr "Создать"
 #: plugins/admin/groups/group-list.xml:98
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:64
 #: plugins/admin/ogroups/ogroup-list.xml:98
 #: plugins/personal/generic/generic_certs.tpl:22
 #: plugins/personal/generic/generic_certs.tpl:48
@@ -366,8 +361,6 @@ msgstr ""
 #: plugins/admin/groups/class_group.inc:758
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:94
 #: plugins/admin/ogroups/class_ogroup.inc:402
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:429
@@ -590,7 +583,7 @@ msgstr "Шаблон"
 #: plugins/personal/generic/class_user.inc:1703
 #: plugins/personal/generic/class_user.inc:1857
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:15
+#: ihtml/themes/default/infoPage.tpl:19
 msgid "Given name"
 msgstr "Имя"
 
@@ -652,7 +645,7 @@ msgstr "Изменить свойства"
 #: plugins/admin/groups/class_groupManagement.inc:165
 #: plugins/admin/ogroups/tabs_ogroups.inc:155
 #: plugins/generic/infoPage/class_infoPage.inc:112
-#: ihtml/themes/default/infoPage.tpl:20
+#: ihtml/themes/default/infoPage.tpl:24
 msgid "Mail"
 msgstr "Почта"
 
@@ -856,7 +849,7 @@ msgstr "Пользователь"
 #: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/generic/class_user.inc:1702
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:14
+#: ihtml/themes/default/infoPage.tpl:18
 #, fuzzy
 msgid "Surname"
 msgstr "Имя сервера"
@@ -1478,7 +1471,7 @@ msgstr "Адм. единица"
 #: plugins/admin/departments/generic.tpl:95
 #: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/class_user.inc:1734
-#: ihtml/themes/default/infoPage.tpl:28
+#: ihtml/themes/default/infoPage.tpl:32
 msgid "Location"
 msgstr "Местоположение"
 
@@ -1540,6 +1533,7 @@ msgstr ""
 
 #: plugins/admin/departments/dep-filter.xml:35
 #: plugins/admin/departments/generic.tpl:4
+#: ihtml/themes/default/infoPage.tpl:31
 #, fuzzy
 msgid "Organizational Unit"
 msgstr "Организация"
@@ -1553,7 +1547,7 @@ msgstr "Организация"
 #: plugins/admin/departments/class_departmentManagement.inc:241
 #: plugins/personal/generic/generic.tpl:298
 #: plugins/personal/generic/class_user.inc:1720 setup/setup_feedback.tpl:10
-#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:26
+#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:30
 msgid "Organization"
 msgstr "Организация"
 
@@ -1685,69 +1679,6 @@ msgid ""
 "management dialog."
 msgstr ""
 
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:10
-#, fuzzy
-msgid "List of items"
-msgstr "Список пользователей"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:75
-#, fuzzy
-msgid "Edit item"
-msgstr "Изменить сертификаты"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:82
-#, fuzzy
-msgid "Remove item"
-msgstr "Удалить изображение"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:9
-#, fuzzy
-msgid "Container"
-msgstr "Продолжить"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:10
-msgid "Item"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:8
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:9
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:352
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:353
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:359
-#, fuzzy
-msgid "Config management"
-msgstr "Управление системами"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:95
-#, php-format
-msgid "Failed to load distributions, error was '%s'!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:262
-msgid "No selectable install methods returned!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:263
-#: setup/class_setup.inc:183
-#, fuzzy
-msgid "Setup"
-msgstr "Установить"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:278
-#, fuzzy
-msgid "Distribution"
-msgstr "Описание"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:284
-msgid "Release"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:290
-#, fuzzy
-msgid "Component"
-msgstr "Администраторы домена"
-
 #: plugins/admin/ogroups/paste_generic.tpl:1
 #, fuzzy
 msgid "Paste object group"
@@ -1759,9 +1690,7 @@ msgid "Please enter the new object group name"
 msgstr "Введите адрес сервера"
 
 #: plugins/admin/ogroups/paste_generic.tpl:16
-msgid ""
-"Copy members. Be careful with this option, systems can only inherit from a "
-"single object group!"
+msgid "Warning: systems can only inherit from a single object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup-list.xml:11
@@ -2155,7 +2084,7 @@ msgid "Shell"
 msgstr "Оболочка"
 
 #: plugins/personal/posix/class_posixAccount.inc:1310
-#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:13
+#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:17
 msgid "User ID"
 msgstr "Идентификатор пользователя"
 
@@ -2368,7 +2297,7 @@ msgid "Your password hash method will not be changed!"
 msgstr "У вас недостаточно прав для смены своего пароля."
 
 #: plugins/personal/generic/paste_generic.tpl:1
-#: ihtml/themes/default/infoPage.tpl:44
+#: ihtml/themes/default/infoPage.tpl:48
 #, fuzzy
 msgid "User settings"
 msgstr "Почтовые настройки пользователя"
@@ -2469,20 +2398,20 @@ msgstr "Шаблон"
 
 #: plugins/personal/generic/generic.tpl:92
 #: plugins/personal/generic/class_user.inc:1708
-#: ihtml/themes/default/infoPage.tpl:16
+#: ihtml/themes/default/infoPage.tpl:20
 msgid "Personal title"
 msgstr "Обращение"
 
 #: plugins/personal/generic/generic.tpl:102
 #: plugins/personal/generic/class_user.inc:1709
-#: ihtml/themes/default/infoPage.tpl:17
+#: ihtml/themes/default/infoPage.tpl:21
 msgid "Academic title"
 msgstr "Академическое звание"
 
 #: plugins/personal/generic/generic.tpl:117
 #: plugins/personal/generic/class_user.inc:1368
 #: plugins/personal/generic/class_user.inc:1711
-#: ihtml/themes/default/infoPage.tpl:19
+#: ihtml/themes/default/infoPage.tpl:23
 msgid "Date of birth"
 msgstr "Дата рождения"
 
@@ -2560,7 +2489,7 @@ msgstr "Номер работника"
 
 #: plugins/personal/generic/generic.tpl:330
 #: plugins/personal/generic/class_user.inc:1725
-#: ihtml/themes/default/infoPage.tpl:33
+#: ihtml/themes/default/infoPage.tpl:37
 msgid "Employee type"
 msgstr "Форма трудоустройства"
 
@@ -2613,7 +2542,7 @@ msgstr "Подразделение"
 
 #: plugins/personal/generic/generic.tpl:535
 #: plugins/personal/generic/class_user.inc:1665
-#: ihtml/themes/default/infoPage.tpl:29
+#: ihtml/themes/default/infoPage.tpl:33
 msgid "Street"
 msgstr "Улица"
 
@@ -2714,7 +2643,7 @@ msgstr "У выбранного приложения нет параметров
 
 #: plugins/personal/generic/class_user.inc:1051
 msgid ""
-"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-"
 "imagick' to be installed!"
 msgstr ""
 
@@ -2761,13 +2690,13 @@ msgid "Login restrictions"
 msgstr "Срок действия пароля истекает"
 
 #: plugins/personal/generic/class_user.inc:1722
-#: ihtml/themes/default/infoPage.tpl:30
+#: ihtml/themes/default/infoPage.tpl:34
 #, fuzzy
 msgid "Department number"
 msgstr "Управление подразделениями"
 
 #: plugins/personal/generic/class_user.inc:1724
-#: ihtml/themes/default/infoPage.tpl:32
+#: ihtml/themes/default/infoPage.tpl:36
 #, fuzzy
 msgid "Employee number"
 msgstr "Форма трудоустройства"
@@ -2798,11 +2727,12 @@ msgid "Fax number"
 msgstr "Терминал"
 
 #: plugins/personal/generic/class_user.inc:1737
-#: ihtml/themes/default/infoPage.tpl:18
+#: ihtml/themes/default/infoPage.tpl:22
 msgid "Home postal address"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1738
+#: ihtml/themes/default/infoPage.tpl:25
 #, fuzzy
 msgid "Home phone number"
 msgstr "Телефонные номера"
@@ -3053,12 +2983,12 @@ msgstr "Дата"
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:204
 #, php-format
-msgid "Migration failed for object %s, dn already exists!"
+msgid "Migration failed for object %s: DN already exists!"
 msgstr ""
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:208
 #, php-format
-msgid "Migration failed for object %s, please check if it already exists!"
+msgid "Migration failed for object %s: please check if it already exists!"
 msgstr ""
 
 #: plugins/addons/propertyEditor/migrate.tpl:3
@@ -3163,7 +3093,7 @@ msgstr ""
 msgid "Dynamic object"
 msgstr "Объект"
 
-#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:62
+#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:66
 msgid "The GOsa team"
 msgstr "Команда разработчиков GOsa"
 
@@ -4511,6 +4441,11 @@ msgid ""
 "add the object class '%s' manually."
 msgstr ""
 
+#: setup/class_setup.inc:183
+#, fuzzy
+msgid "Setup"
+msgstr "Установить"
+
 #: setup/class_setup.inc:195
 #, fuzzy
 msgid "Completed"
@@ -4734,16 +4669,7 @@ msgstr "Использовать шифрование SSL"
 msgid "User information"
 msgstr "Личная информация"
 
-#: ihtml/themes/default/infoPage.tpl:21
-msgid "Home phone"
-msgstr "Домашний телефон"
-
-#: ihtml/themes/default/infoPage.tpl:27
-#, fuzzy
-msgid "Organizational unit"
-msgstr "Организация"
-
-#: ihtml/themes/default/infoPage.tpl:51
+#: ihtml/themes/default/infoPage.tpl:55
 #, fuzzy
 msgid "Administrative contact"
 msgstr "Администрирование"
@@ -6383,7 +6309,7 @@ msgstr ""
 msgid ""
 "Enables event logging in GOsa. Setting it to 'On' make GOsa log every action "
 "a user performs via syslog. If you use this in combination with rsyslog and "
-"configure it to mysql logging, you can browse all events in GOsa."
+"configure it to MySQL logging, you can browse all events in GOsa."
 msgstr ""
 
 #: include/class_core.inc:279
@@ -7151,6 +7077,41 @@ msgstr ""
 msgid "Welcome to GOsa"
 msgstr "Добро пожаловать в раздел настройки GOsa!"
 
+#, fuzzy
+#~ msgid "List of items"
+#~ msgstr "Список пользователей"
+
+#, fuzzy
+#~ msgid "Edit item"
+#~ msgstr "Изменить сертификаты"
+
+#, fuzzy
+#~ msgid "Remove item"
+#~ msgstr "Удалить изображение"
+
+#, fuzzy
+#~ msgid "Container"
+#~ msgstr "Продолжить"
+
+#, fuzzy
+#~ msgid "Config management"
+#~ msgstr "Управление системами"
+
+#, fuzzy
+#~ msgid "Distribution"
+#~ msgstr "Описание"
+
+#, fuzzy
+#~ msgid "Component"
+#~ msgstr "Администраторы домена"
+
+#~ msgid "Home phone"
+#~ msgstr "Домашний телефон"
+
+#, fuzzy
+#~ msgid "Organizational unit"
+#~ msgstr "Организация"
+
 #, fuzzy
 #~ msgid "Max"
 #~ msgstr "Май"

diff --git a/gosa-core/locale/core/vi/LC_MESSAGES/messages.po b/gosa-core/locale/core/vi/LC_MESSAGES/messages.po
index 153028989f2ca2ae1f7d924e8ce9dd5c2da5703d..afdf0b443203afceb4e01af3bfe47a8a1f5209b1 100644 (file)
--- a/gosa-core/locale/core/vi/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/vi/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VIcore2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-01 15:07+0100\n"
+"POT-Creation-Date: 2010-12-01 16:21+0100\n"
 "PO-Revision-Date: 2008-07-04 09:59+0200\n"
 "Last-Translator: Stefan Koehler <stefan@gonicus.de>\n"
 "Language-Team: Vietnamese\n"
@@ -25,7 +25,6 @@ msgstr ""
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml:21
 #: plugins/admin/groups/group-filter.xml:17
 #: plugins/admin/departments/dep-filter.xml:17
-#: plugins/admin/newConfigManagement/DeviceConfig-filter.xml:14
 #: plugins/admin/ogroups/ogroup-filter.xml:18
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.xml:32
 #: plugins/personal/posix/trustSelect/trust-filter.xml:17
@@ -110,7 +109,6 @@ msgstr "Vai trò"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:34
 #: plugins/admin/ogroups/ogroup-list.xml:41
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
 #: plugins/admin/ogroups/class_ogroup.inc:157
@@ -166,7 +164,6 @@ msgstr "Tên"
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:63
 #: plugins/admin/departments/class_domain.inc:91
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:42
 #: plugins/admin/ogroups/ogroup-list.xml:49
 #: plugins/admin/ogroups/generic.tpl:15
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
@@ -191,7 +188,6 @@ msgstr "Mô tả"
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/users/user-list.xml:78
 #: plugins/admin/groups/group-list.xml:62
 #: plugins/admin/departments/dep-list.xml:87
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:50
 #: plugins/admin/ogroups/ogroup-list.xml:62
 #: plugins/addons/propertyEditor/property-list.xml:96
 #: include/class_listing.inc:1183
@@ -211,7 +207,6 @@ msgstr "Tạo "
 #: plugins/admin/groups/group-list.xml:98
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:64
 #: plugins/admin/ogroups/ogroup-list.xml:98
 #: plugins/personal/generic/generic_certs.tpl:22
 #: plugins/personal/generic/generic_certs.tpl:48
@@ -361,8 +356,6 @@ msgstr ""
 #: plugins/admin/groups/class_group.inc:758
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:94
 #: plugins/admin/ogroups/class_ogroup.inc:402
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:429
@@ -578,7 +571,7 @@ msgstr "Mẫu"
 #: plugins/personal/generic/class_user.inc:1703
 #: plugins/personal/generic/class_user.inc:1857
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:15
+#: ihtml/themes/default/infoPage.tpl:19
 msgid "Given name"
 msgstr "Tên thật"
 
@@ -639,7 +632,7 @@ msgstr "Hiệu chỉnh các tính năng UNIX"
 #: plugins/admin/groups/class_groupManagement.inc:165
 #: plugins/admin/ogroups/tabs_ogroups.inc:155
 #: plugins/generic/infoPage/class_infoPage.inc:112
-#: ihtml/themes/default/infoPage.tpl:20
+#: ihtml/themes/default/infoPage.tpl:24
 msgid "Mail"
 msgstr "Thư"
 
@@ -834,7 +827,7 @@ msgstr "Người dùng"
 #: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/generic/class_user.inc:1702
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:14
+#: ihtml/themes/default/infoPage.tpl:18
 #, fuzzy
 msgid "Surname"
 msgstr "Họ "
@@ -1442,7 +1435,7 @@ msgstr "Bang"
 #: plugins/admin/departments/generic.tpl:95
 #: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/class_user.inc:1734
-#: ihtml/themes/default/infoPage.tpl:28
+#: ihtml/themes/default/infoPage.tpl:32
 msgid "Location"
 msgstr "Vị trí"
 
@@ -1508,6 +1501,7 @@ msgstr ""
 
 #: plugins/admin/departments/dep-filter.xml:35
 #: plugins/admin/departments/generic.tpl:4
+#: ihtml/themes/default/infoPage.tpl:31
 #, fuzzy
 msgid "Organizational Unit"
 msgstr "Tổ chức"
@@ -1521,7 +1515,7 @@ msgstr "Tổ chức"
 #: plugins/admin/departments/class_departmentManagement.inc:241
 #: plugins/personal/generic/generic.tpl:298
 #: plugins/personal/generic/class_user.inc:1720 setup/setup_feedback.tpl:10
-#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:26
+#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:30
 msgid "Organization"
 msgstr "Tổ chức"
 
@@ -1658,69 +1652,6 @@ msgstr ""
 "Ngay sau khi thao tác tag kết thúc, bạn có thể kéo xuống cuối trang và kích "
 "vào phím \"Tiếp tục\" để tiếp tục với hộp thoại quản lý bộ phận."
 
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:10
-#, fuzzy
-msgid "List of items"
-msgstr "Danh sách người dùng"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:75
-#, fuzzy
-msgid "Edit item"
-msgstr "Hiệu chỉnh các giấy phép"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:82
-#, fuzzy
-msgid "Remove item"
-msgstr "Xóa ảnh "
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:9
-#, fuzzy
-msgid "Container"
-msgstr "Tiếp tục"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:10
-msgid "Item"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:8
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:9
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:352
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:353
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:359
-#, fuzzy
-msgid "Config management"
-msgstr "Quản trị cấu hình/hệ thống-"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:95
-#, php-format
-msgid "Failed to load distributions, error was '%s'!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:262
-msgid "No selectable install methods returned!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:263
-#: setup/class_setup.inc:183
-#, fuzzy
-msgid "Setup"
-msgstr "Đặt"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:278
-#, fuzzy
-msgid "Distribution"
-msgstr "Mô tả"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:284
-msgid "Release"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:290
-#, fuzzy
-msgid "Component"
-msgstr "Admin miền"
-
 #: plugins/admin/ogroups/paste_generic.tpl:1
 #, fuzzy
 msgid "Paste object group"
@@ -1731,9 +1662,7 @@ msgid "Please enter the new object group name"
 msgstr "Xin mời nhập tên nhóm đối tượng mới vào"
 
 #: plugins/admin/ogroups/paste_generic.tpl:16
-msgid ""
-"Copy members. Be careful with this option, systems can only inherit from a "
-"single object group!"
+msgid "Warning: systems can only inherit from a single object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup-list.xml:11
@@ -2109,7 +2038,7 @@ msgid "Shell"
 msgstr "Shell"
 
 #: plugins/personal/posix/class_posixAccount.inc:1310
-#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:13
+#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:17
 msgid "User ID"
 msgstr "ID người dùng"
 
@@ -2309,7 +2238,7 @@ msgid "Your password hash method will not be changed!"
 msgstr "Mật khẩu của bạn đã được thay đổi thành công."
 
 #: plugins/personal/generic/paste_generic.tpl:1
-#: ihtml/themes/default/infoPage.tpl:44
+#: ihtml/themes/default/infoPage.tpl:48
 msgid "User settings"
 msgstr "Thiết lập của người dùng"
 
@@ -2405,20 +2334,20 @@ msgstr "Tên Mẫu"
 
 #: plugins/personal/generic/generic.tpl:92
 #: plugins/personal/generic/class_user.inc:1708
-#: ihtml/themes/default/infoPage.tpl:16
+#: ihtml/themes/default/infoPage.tpl:20
 msgid "Personal title"
 msgstr "Chức danh cá nhân"
 
 #: plugins/personal/generic/generic.tpl:102
 #: plugins/personal/generic/class_user.inc:1709
-#: ihtml/themes/default/infoPage.tpl:17
+#: ihtml/themes/default/infoPage.tpl:21
 msgid "Academic title"
 msgstr "Chức danh học thuật"
 
 #: plugins/personal/generic/generic.tpl:117
 #: plugins/personal/generic/class_user.inc:1368
 #: plugins/personal/generic/class_user.inc:1711
-#: ihtml/themes/default/infoPage.tpl:19
+#: ihtml/themes/default/infoPage.tpl:23
 msgid "Date of birth"
 msgstr "Ngày sinh"
 
@@ -2495,7 +2424,7 @@ msgstr "Số nhân viên"
 
 #: plugins/personal/generic/generic.tpl:330
 #: plugins/personal/generic/class_user.inc:1725
-#: ihtml/themes/default/infoPage.tpl:33
+#: ihtml/themes/default/infoPage.tpl:37
 msgid "Employee type"
 msgstr "Loại nhân viên"
 
@@ -2548,7 +2477,7 @@ msgstr "Đơn vị"
 
 #: plugins/personal/generic/generic.tpl:535
 #: plugins/personal/generic/class_user.inc:1665
-#: ihtml/themes/default/infoPage.tpl:29
+#: ihtml/themes/default/infoPage.tpl:33
 msgid "Street"
 msgstr "Phố"
 
@@ -2644,7 +2573,7 @@ msgstr "Phương pháp lập mật khẩu được chọn này không còn ở 
 
 #: plugins/personal/generic/class_user.inc:1051
 msgid ""
-"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-"
 "imagick' to be installed!"
 msgstr ""
 
@@ -2688,12 +2617,12 @@ msgid "Login restrictions"
 msgstr "Các hạn chế mật khẩu"
 
 #: plugins/personal/generic/class_user.inc:1722
-#: ihtml/themes/default/infoPage.tpl:30
+#: ihtml/themes/default/infoPage.tpl:34
 msgid "Department number"
 msgstr "Số phòng làm việc"
 
 #: plugins/personal/generic/class_user.inc:1724
-#: ihtml/themes/default/infoPage.tpl:32
+#: ihtml/themes/default/infoPage.tpl:36
 msgid "Employee number"
 msgstr "Số nhân viên"
 
@@ -2719,11 +2648,12 @@ msgid "Fax number"
 msgstr "Số fax"
 
 #: plugins/personal/generic/class_user.inc:1737
-#: ihtml/themes/default/infoPage.tpl:18
+#: ihtml/themes/default/infoPage.tpl:22
 msgid "Home postal address"
 msgstr "Đại chỉ nhà theo bưu điện"
 
 #: plugins/personal/generic/class_user.inc:1738
+#: ihtml/themes/default/infoPage.tpl:25
 msgid "Home phone number"
 msgstr "Số điện thoại nhà"
 
@@ -2969,14 +2899,15 @@ msgstr "Di trú"
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:204
 #, fuzzy, php-format
-msgid "Migration failed for object %s, dn already exists!"
+msgid "Migration failed for object %s: DN already exists!"
 msgstr ""
 "Việc thêm một người dùng quản trị đã thất bại: đối tượng '%s' đã có rồi!"
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:208
-#, php-format
-msgid "Migration failed for object %s, please check if it already exists!"
+#, fuzzy, php-format
+msgid "Migration failed for object %s: please check if it already exists!"
 msgstr ""
+"Việc thêm một người dùng quản trị đã thất bại: đối tượng '%s' đã có rồi!"
 
 #: plugins/addons/propertyEditor/migrate.tpl:3
 msgid "Property migration assistant"
@@ -3081,7 +3012,7 @@ msgstr ""
 msgid "Dynamic object"
 msgstr "Đối tượng GOsa"
 
-#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:62
+#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:66
 msgid "The GOsa team"
 msgstr "Nhóm phát triển Gosa"
 
@@ -4428,6 +4359,11 @@ msgid ""
 "add the object class '%s' manually."
 msgstr ""
 
+#: setup/class_setup.inc:183
+#, fuzzy
+msgid "Setup"
+msgstr "Đặt"
+
 #: setup/class_setup.inc:195
 msgid "Completed"
 msgstr "Đã hoàn thành"
@@ -4660,17 +4596,7 @@ msgstr "Vào phiên SSL"
 msgid "User information"
 msgstr "hiển thị thông tin"
 
-#: ihtml/themes/default/infoPage.tpl:21
-#, fuzzy
-msgid "Home phone"
-msgstr "Số điện thoại nhà"
-
-#: ihtml/themes/default/infoPage.tpl:27
-#, fuzzy
-msgid "Organizational unit"
-msgstr "Tổ chức"
-
-#: ihtml/themes/default/infoPage.tpl:51
+#: ihtml/themes/default/infoPage.tpl:55
 #, fuzzy
 msgid "Administrative contact"
 msgstr "Thiết lập quản trị"
@@ -6293,7 +6219,7 @@ msgstr ""
 msgid ""
 "Enables event logging in GOsa. Setting it to 'On' make GOsa log every action "
 "a user performs via syslog. If you use this in combination with rsyslog and "
-"configure it to mysql logging, you can browse all events in GOsa."
+"configure it to MySQL logging, you can browse all events in GOsa."
 msgstr ""
 
 #: include/class_core.inc:279
@@ -7067,6 +6993,42 @@ msgstr ""
 msgid "Welcome to GOsa"
 msgstr "Chào mừng bạn đến với bộ cài đặt wizard GOsa"
 
+#, fuzzy
+#~ msgid "List of items"
+#~ msgstr "Danh sách người dùng"
+
+#, fuzzy
+#~ msgid "Edit item"
+#~ msgstr "Hiệu chỉnh các giấy phép"
+
+#, fuzzy
+#~ msgid "Remove item"
+#~ msgstr "Xóa ảnh "
+
+#, fuzzy
+#~ msgid "Container"
+#~ msgstr "Tiếp tục"
+
+#, fuzzy
+#~ msgid "Config management"
+#~ msgstr "Quản trị cấu hình/hệ thống-"
+
+#, fuzzy
+#~ msgid "Distribution"
+#~ msgstr "Mô tả"
+
+#, fuzzy
+#~ msgid "Component"
+#~ msgstr "Admin miền"
+
+#, fuzzy
+#~ msgid "Home phone"
+#~ msgstr "Số điện thoại nhà"
+
+#, fuzzy
+#~ msgid "Organizational unit"
+#~ msgstr "Tổ chức"
+
 #, fuzzy
 #~ msgid "Max"
 #~ msgstr "Tháng Năm"

diff --git a/gosa-core/locale/core/zh/LC_MESSAGES/messages.po b/gosa-core/locale/core/zh/LC_MESSAGES/messages.po
index 07214f46f6958a14af95670d86105c850ad4149a..37307280a25037a56561b592ee7e2a17a78dbd65 100644 (file)
--- a/gosa-core/locale/core/zh/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-01 15:07+0100\n"
+"POT-Creation-Date: 2010-12-01 16:21+0100\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"
@@ -23,7 +23,6 @@ msgstr ""
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml:21
 #: plugins/admin/groups/group-filter.xml:17
 #: plugins/admin/departments/dep-filter.xml:17
-#: plugins/admin/newConfigManagement/DeviceConfig-filter.xml:14
 #: plugins/admin/ogroups/ogroup-filter.xml:18
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.xml:32
 #: plugins/personal/posix/trustSelect/trust-filter.xml:17
@@ -109,7 +108,6 @@ msgstr "角色"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:34
 #: plugins/admin/ogroups/ogroup-list.xml:41
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
 #: plugins/admin/ogroups/class_ogroup.inc:157
@@ -165,7 +163,6 @@ msgstr "名称"
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:63
 #: plugins/admin/departments/class_domain.inc:91
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:42
 #: plugins/admin/ogroups/ogroup-list.xml:49
 #: plugins/admin/ogroups/generic.tpl:15
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
@@ -190,7 +187,6 @@ msgstr "描述"
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/users/user-list.xml:78
 #: plugins/admin/groups/group-list.xml:62
 #: plugins/admin/departments/dep-list.xml:87
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:50
 #: plugins/admin/ogroups/ogroup-list.xml:62
 #: plugins/addons/propertyEditor/property-list.xml:96
 #: include/class_listing.inc:1183
@@ -210,7 +206,6 @@ msgstr "创建"
 #: plugins/admin/groups/group-list.xml:98
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:64
 #: plugins/admin/ogroups/ogroup-list.xml:98
 #: plugins/personal/generic/generic_certs.tpl:22
 #: plugins/personal/generic/generic_certs.tpl:48
@@ -367,8 +362,6 @@ msgstr "这个共享不能被删除，因为仍然被 %d 个用户使用："
 #: plugins/admin/groups/class_group.inc:758
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:94
 #: plugins/admin/ogroups/class_ogroup.inc:402
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:429
@@ -591,7 +584,7 @@ msgstr "模板"
 #: plugins/personal/generic/class_user.inc:1703
 #: plugins/personal/generic/class_user.inc:1857
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:15
+#: ihtml/themes/default/infoPage.tpl:19
 msgid "Given name"
 msgstr "名"
 
@@ -652,7 +645,7 @@ msgstr "编辑 UNIX 属性"
 #: plugins/admin/groups/class_groupManagement.inc:165
 #: plugins/admin/ogroups/tabs_ogroups.inc:155
 #: plugins/generic/infoPage/class_infoPage.inc:112
-#: ihtml/themes/default/infoPage.tpl:20
+#: ihtml/themes/default/infoPage.tpl:24
 msgid "Mail"
 msgstr "邮件"
 
@@ -844,7 +837,7 @@ msgstr "用户"
 #: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/generic/class_user.inc:1702
 #: plugins/generic/references/class_reference.inc:87
-#: ihtml/themes/default/infoPage.tpl:14
+#: ihtml/themes/default/infoPage.tpl:18
 msgid "Surname"
 msgstr "姓"
 
@@ -1460,7 +1453,7 @@ msgstr "州/省"
 #: plugins/admin/departments/generic.tpl:95
 #: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/class_user.inc:1734
-#: ihtml/themes/default/infoPage.tpl:28
+#: ihtml/themes/default/infoPage.tpl:32
 msgid "Location"
 msgstr "位置"
 
@@ -1522,6 +1515,7 @@ msgstr ""
 
 #: plugins/admin/departments/dep-filter.xml:35
 #: plugins/admin/departments/generic.tpl:4
+#: ihtml/themes/default/infoPage.tpl:31
 #, fuzzy
 msgid "Organizational Unit"
 msgstr "组织/公司部门"
@@ -1535,7 +1529,7 @@ msgstr "组织/公司部门"
 #: plugins/admin/departments/class_departmentManagement.inc:241
 #: plugins/personal/generic/generic.tpl:298
 #: plugins/personal/generic/class_user.inc:1720 setup/setup_feedback.tpl:10
-#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:26
+#: setup/setup_feedback.tpl:12 ihtml/themes/default/infoPage.tpl:30
 msgid "Organization"
 msgstr "组织/公司"
 
@@ -1666,69 +1660,6 @@ msgid ""
 "management dialog."
 msgstr ""
 
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:10
-#, fuzzy
-msgid "List of items"
-msgstr "用户列表"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:75
-#, fuzzy
-msgid "Edit item"
-msgstr "编辑证书"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.xml:82
-#, fuzzy
-msgid "Remove item"
-msgstr "删除图片"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:9
-#, fuzzy
-msgid "Container"
-msgstr "继续"
-
-#: plugins/admin/newConfigManagement/DeviceConfig-list.tpl:10
-msgid "Item"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:8
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:9
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:352
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:353
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:359
-#, fuzzy
-msgid "Config management"
-msgstr "系统管理"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:42
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:95
-#, php-format
-msgid "Failed to load distributions, error was '%s'!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:262
-msgid "No selectable install methods returned!"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:263
-#: setup/class_setup.inc:183
-#, fuzzy
-msgid "Setup"
-msgstr "设置"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:278
-#, fuzzy
-msgid "Distribution"
-msgstr "描述"
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:284
-msgid "Release"
-msgstr ""
-
-#: plugins/admin/newConfigManagement/class_newConfigManagement.inc:290
-#, fuzzy
-msgid "Component"
-msgstr "域管理员"
-
 #: plugins/admin/ogroups/paste_generic.tpl:1
 #, fuzzy
 msgid "Paste object group"
@@ -1739,9 +1670,7 @@ msgid "Please enter the new object group name"
 msgstr "请输入新对象组名称"
 
 #: plugins/admin/ogroups/paste_generic.tpl:16
-msgid ""
-"Copy members. Be careful with this option, systems can only inherit from a "
-"single object group!"
+msgid "Warning: systems can only inherit from a single object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup-list.xml:11
@@ -2123,7 +2052,7 @@ msgid "Shell"
 msgstr "Shell"
 
 #: plugins/personal/posix/class_posixAccount.inc:1310
-#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:13
+#: setup/setup_migrate.tpl:49 ihtml/themes/default/infoPage.tpl:17
 msgid "User ID"
 msgstr "用户 ID"
 
@@ -2330,7 +2259,7 @@ msgid "Your password hash method will not be changed!"
 msgstr "您的口令已经过期 !! 选择一个新口令"
 
 #: plugins/personal/generic/paste_generic.tpl:1
-#: ihtml/themes/default/infoPage.tpl:44
+#: ihtml/themes/default/infoPage.tpl:48
 msgid "User settings"
 msgstr "用户设置"
 
@@ -2426,20 +2355,20 @@ msgstr "模板名称"
 
 #: plugins/personal/generic/generic.tpl:92
 #: plugins/personal/generic/class_user.inc:1708
-#: ihtml/themes/default/infoPage.tpl:16
+#: ihtml/themes/default/infoPage.tpl:20
 msgid "Personal title"
 msgstr "个人称谓"
 
 #: plugins/personal/generic/generic.tpl:102
 #: plugins/personal/generic/class_user.inc:1709
-#: ihtml/themes/default/infoPage.tpl:17
+#: ihtml/themes/default/infoPage.tpl:21
 msgid "Academic title"
 msgstr "学位头衔"
 
 #: plugins/personal/generic/generic.tpl:117
 #: plugins/personal/generic/class_user.inc:1368
 #: plugins/personal/generic/class_user.inc:1711
-#: ihtml/themes/default/infoPage.tpl:19
+#: ihtml/themes/default/infoPage.tpl:23
 msgid "Date of birth"
 msgstr "生日"
 
@@ -2517,7 +2446,7 @@ msgstr "员工编号"
 
 #: plugins/personal/generic/generic.tpl:330
 #: plugins/personal/generic/class_user.inc:1725
-#: ihtml/themes/default/infoPage.tpl:33
+#: ihtml/themes/default/infoPage.tpl:37
 msgid "Employee type"
 msgstr "员工类别"
 
@@ -2570,7 +2499,7 @@ msgstr "单元"
 
 #: plugins/personal/generic/generic.tpl:535
 #: plugins/personal/generic/class_user.inc:1665
-#: ihtml/themes/default/infoPage.tpl:29
+#: ihtml/themes/default/infoPage.tpl:33
 msgid "Street"
 msgstr "街道"
 
@@ -2670,7 +2599,7 @@ msgstr "此应用程序不再可用。"
 
 #: plugins/personal/generic/class_user.inc:1051
 msgid ""
-"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-"
 "imagick' to be installed!"
 msgstr ""
 
@@ -2717,13 +2646,13 @@ msgid "Login restrictions"
 msgstr "口令过期截止日"
 
 #: plugins/personal/generic/class_user.inc:1722
-#: ihtml/themes/default/infoPage.tpl:30
+#: ihtml/themes/default/infoPage.tpl:34
 #, fuzzy
 msgid "Department number"
 msgstr "部门名称"
 
 #: plugins/personal/generic/class_user.inc:1724
-#: ihtml/themes/default/infoPage.tpl:32
+#: ihtml/themes/default/infoPage.tpl:36
 #, fuzzy
 msgid "Employee number"
 msgstr "员工类别"
@@ -2754,11 +2683,12 @@ msgid "Fax number"
 msgstr "系列号"
 
 #: plugins/personal/generic/class_user.inc:1737
-#: ihtml/themes/default/infoPage.tpl:18
+#: ihtml/themes/default/infoPage.tpl:22
 msgid "Home postal address"
 msgstr "住宅地址"
 
 #: plugins/personal/generic/class_user.inc:1738
+#: ihtml/themes/default/infoPage.tpl:25
 #, fuzzy
 msgid "Home phone number"
 msgstr "电话号码"
@@ -3008,13 +2938,13 @@ msgstr "创建"
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:204
 #, fuzzy, php-format
-msgid "Migration failed for object %s, dn already exists!"
+msgid "Migration failed for object %s: DN already exists!"
 msgstr "为对象 '%s' 设置动作状态(FAIstate) 失败，值为 '%s'。"
 
 #: plugins/addons/propertyEditor/migration/class_migrateRDN.inc:208
-#, php-format
-msgid "Migration failed for object %s, please check if it already exists!"
-msgstr ""
+#, fuzzy, php-format
+msgid "Migration failed for object %s: please check if it already exists!"
+msgstr "为对象 '%s' 设置动作状态(FAIstate) 失败，值为 '%s'。"
 
 #: plugins/addons/propertyEditor/migrate.tpl:3
 msgid "Property migration assistant"
@@ -3119,7 +3049,7 @@ msgstr ""
 msgid "Dynamic object"
 msgstr "对象"
 
-#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:62
+#: plugins/generic/welcome/welcome.tpl:8 ihtml/themes/default/infoPage.tpl:66
 msgid "The GOsa team"
 msgstr "GOsa 团队"
 
@@ -4458,6 +4388,11 @@ msgid ""
 "add the object class '%s' manually."
 msgstr ""
 
+#: setup/class_setup.inc:183
+#, fuzzy
+msgid "Setup"
+msgstr "设置"
+
 #: setup/class_setup.inc:195
 #, fuzzy
 msgid "Completed"
@@ -4678,15 +4613,7 @@ msgstr "进入 SSL 会话"
 msgid "User information"
 msgstr "个人信息"
 
-#: ihtml/themes/default/infoPage.tpl:21
-msgid "Home phone"
-msgstr "住宅电话"
-
-#: ihtml/themes/default/infoPage.tpl:27
-msgid "Organizational unit"
-msgstr "组织/公司部门"
-
-#: ihtml/themes/default/infoPage.tpl:51
+#: ihtml/themes/default/infoPage.tpl:55
 #, fuzzy
 msgid "Administrative contact"
 msgstr "管理设置"
@@ -6292,7 +6219,7 @@ msgstr ""
 msgid ""
 "Enables event logging in GOsa. Setting it to 'On' make GOsa log every action "
 "a user performs via syslog. If you use this in combination with rsyslog and "
-"configure it to mysql logging, you can browse all events in GOsa."
+"configure it to MySQL logging, you can browse all events in GOsa."
 msgstr ""
 
 #: include/class_core.inc:279
@@ -7056,6 +6983,40 @@ msgstr ""
 msgid "Welcome to GOsa"
 msgstr "欢迎进入 Gosa 安装程序！"
 
+#, fuzzy
+#~ msgid "List of items"
+#~ msgstr "用户列表"
+
+#, fuzzy
+#~ msgid "Edit item"
+#~ msgstr "编辑证书"
+
+#, fuzzy
+#~ msgid "Remove item"
+#~ msgstr "删除图片"
+
+#, fuzzy
+#~ msgid "Container"
+#~ msgstr "继续"
+
+#, fuzzy
+#~ msgid "Config management"
+#~ msgstr "系统管理"
+
+#, fuzzy
+#~ msgid "Distribution"
+#~ msgstr "描述"
+
+#, fuzzy
+#~ msgid "Component"
+#~ msgstr "域管理员"
+
+#~ msgid "Home phone"
+#~ msgstr "住宅电话"
+
+#~ msgid "Organizational unit"
+#~ msgstr "组织/公司部门"
+
 #, fuzzy
 #~ msgid "Max"
 #~ msgstr "五月"