[tokkee]

tokkee.org

Code

projects / gosa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c163b5d)
Followup-Changes for #3020
authorpsc <psc@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 19 Oct 2009 15:29:29 +0000 (15:29 +0000)
committerpsc <psc@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 19 Oct 2009 15:29:29 +0000 (15:29 +0000)
- Revert change that let object inherit gotoXDriver, because
  this is not wanted (it breaks auto-detection)
- Change caption of '(unknown)' to manual/auto.

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@14605 594d385d-05f5-0310-b6e9-bd551577e9d8

trunk/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc patch | blob | history
trunk/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc patch | blob | history
trunk/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po patch | blob | history
trunk/gosa-plugins/goto/locale/messages.po patch | blob | history

diff --git a/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc b/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
index 7365979658f1e38808d685c038cc58c9beb2f179..7246e559782671d88870fd27aa25bafab71a8fb7 100644 (file)
--- a/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
+++ b/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
@@ -724,7 +724,7 @@ class workgeneric extends plugin
 
     /* Set workstation service attributes to inherited */
     if($this->member_of_ogroup && isset($this->parent->by_object['workservice'])){
-      foreach(array("gotoXKbLayout","gotoXKbModel","gotoXKbVariant","gotoXDriver",
+      foreach(array("gotoXKbLayout","gotoXKbModel","gotoXKbVariant",
             "gotoXResolution","gotoXColordepth","gotoXMouseType","gotoXMouseport") as $name){
         if($this->parent->by_object['workservice']->acl_is_writeable($name)){
           $this->parent->by_object['workservice']->$name = "default"; 
diff --git a/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc b/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
index 7d0e3dc87508b99330565c0cbcc372ce12e7fb3f..1ff57a860b139071e16e74a58377fbc6da81beb9 100644 (file)
--- a/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
+++ b/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
@@ -84,7 +84,7 @@ class workservice extends plugin
       $this->XDrivers[$xdriver] = $xdriver;
     }
 
-    array_unshift($this->XDrivers, "["._("unknown")."]");
+    array_unshift($this->XDrivers, "["._("manual/auto")."]");
  
     $this->XColordepths= array( 
         "8"        => "8 " ._("bit"), 
diff --git a/trunk/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po b/trunk/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po
index 49c8863dc5077005da1592448d01a8d4372c2d2a..ee0f86050c1c5bdac8c5399b9849867bb09b2168 100644 (file)
--- a/trunk/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po
+++ b/trunk/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-13 15:27+0200\n"
+"POT-Creation-Date: 2009-10-19 12:35+0200\n"
 "PO-Revision-Date: 2008-12-04 11:18+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
@@ -1557,7 +1557,6 @@ msgid "Display device"
 msgstr "Anzeige"
 
 #: admin/systems/goto/workstationService.tpl:157
-#: admin/systems/goto/class_workstationService.inc:87
 #: admin/systems/goto/class_terminalService.inc:610
 msgid "unknown"
 msgstr "unbekannt"
@@ -1633,8 +1632,8 @@ msgstr "Aktiv"
 #: admin/systems/goto/class_terminalGeneric.inc:594
 #: admin/systems/goto/class_workstationService.inc:566
 #: admin/systems/goto/class_workstationStartup.inc:942
-#: admin/systems/goto/class_workstationStartup.inc:1069
-#: admin/systems/goto/class_workstationStartup.inc:1129
+#: admin/systems/goto/class_workstationStartup.inc:1107
+#: admin/systems/goto/class_workstationStartup.inc:1175
 #: admin/systems/goto/class_terminalService.inc:673
 #: admin/systems/goto/class_workstationGeneric.inc:212
 #: admin/systems/goto/class_workstationGeneric.inc:635
@@ -1775,8 +1774,8 @@ msgid "set"
 msgstr "setzen"
 
 #: admin/systems/goto/class_workstationService.inc:78
-#: admin/systems/goto/class_workstationStartup.inc:1354
-#: admin/systems/goto/class_workstationStartup.inc:1356
+#: admin/systems/goto/class_workstationStartup.inc:1407
+#: admin/systems/goto/class_workstationStartup.inc:1409
 #: admin/systems/goto/class_terminalService.inc:121
 #: admin/systems/ppd/class_printerPPDDialog.inc:51
 #: admin/systems/ppd/class_printerPPDDialog.inc:114
@@ -1784,6 +1783,10 @@ msgstr "setzen"
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
+#: admin/systems/goto/class_workstationService.inc:87
+msgid "manual/auto"
+msgstr "manuell/auto"
+
 #: admin/systems/goto/class_workstationService.inc:90
 #: admin/systems/goto/class_workstationService.inc:91
 #: admin/systems/goto/class_workstationService.inc:92
@@ -1923,39 +1926,39 @@ msgstr "Debian-Release"
 msgid "FAI status flag"
 msgstr "FAI-Status-Flag"
 
-#: admin/systems/goto/class_workstationStartup.inc:1293
+#: admin/systems/goto/class_workstationStartup.inc:1346
 #, fuzzy
 msgid "Partition table"
 msgstr "Variable"
 
-#: admin/systems/goto/class_workstationStartup.inc:1300
+#: admin/systems/goto/class_workstationStartup.inc:1353
 msgid "Package list"
 msgstr ""
 
-#: admin/systems/goto/class_workstationStartup.inc:1307
+#: admin/systems/goto/class_workstationStartup.inc:1360
 #, fuzzy
 msgid "Scripts"
 msgstr "Skript"
 
-#: admin/systems/goto/class_workstationStartup.inc:1314
+#: admin/systems/goto/class_workstationStartup.inc:1367
 #, fuzzy
 msgid "Variables"
 msgstr "Variable"
 
-#: admin/systems/goto/class_workstationStartup.inc:1321
+#: admin/systems/goto/class_workstationStartup.inc:1374
 msgid "Hooks"
 msgstr ""
 
-#: admin/systems/goto/class_workstationStartup.inc:1328
+#: admin/systems/goto/class_workstationStartup.inc:1381
 #: personal/environment/environment.tpl:145
 msgid "Profile"
 msgstr "Profil"
 
-#: admin/systems/goto/class_workstationStartup.inc:1335
+#: admin/systems/goto/class_workstationStartup.inc:1388
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: admin/systems/goto/class_workstationStartup.inc:1356
+#: admin/systems/goto/class_workstationStartup.inc:1409
 msgid "'repositoryBranchHook' returned no result!"
 msgstr "'repositoryBranchHook' hat kein Ergebnis zurückgeliefert!"
 
diff --git a/trunk/gosa-plugins/goto/locale/messages.po b/trunk/gosa-plugins/goto/locale/messages.po
index 21ac1ce8ac2eb594c3d816edc1b4ad8d6e8dc575..43dbb8416189adf6b4f966bfa07dc102c29d4c7f 100644 (file)
--- a/trunk/gosa-plugins/goto/locale/messages.po
+++ b/trunk/gosa-plugins/goto/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-13 15:27+0200\n"
+"POT-Creation-Date: 2009-10-19 12:35+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1515,7 +1515,6 @@ msgid "Display device"
 msgstr ""
 
 #: admin/systems/goto/workstationService.tpl:157
-#: admin/systems/goto/class_workstationService.inc:87
 #: admin/systems/goto/class_terminalService.inc:610
 msgid "unknown"
 msgstr ""
@@ -1591,8 +1590,8 @@ msgstr ""
 #: admin/systems/goto/class_terminalGeneric.inc:594
 #: admin/systems/goto/class_workstationService.inc:566
 #: admin/systems/goto/class_workstationStartup.inc:942
-#: admin/systems/goto/class_workstationStartup.inc:1069
-#: admin/systems/goto/class_workstationStartup.inc:1129
+#: admin/systems/goto/class_workstationStartup.inc:1107
+#: admin/systems/goto/class_workstationStartup.inc:1175
 #: admin/systems/goto/class_terminalService.inc:673
 #: admin/systems/goto/class_workstationGeneric.inc:212
 #: admin/systems/goto/class_workstationGeneric.inc:635
@@ -1731,8 +1730,8 @@ msgid "set"
 msgstr ""
 
 #: admin/systems/goto/class_workstationService.inc:78
-#: admin/systems/goto/class_workstationStartup.inc:1354
-#: admin/systems/goto/class_workstationStartup.inc:1356
+#: admin/systems/goto/class_workstationStartup.inc:1407
+#: admin/systems/goto/class_workstationStartup.inc:1409
 #: admin/systems/goto/class_terminalService.inc:121
 #: admin/systems/ppd/class_printerPPDDialog.inc:51
 #: admin/systems/ppd/class_printerPPDDialog.inc:114
@@ -1740,6 +1739,10 @@ msgstr ""
 msgid "Configuration error"
 msgstr ""
 
+#: admin/systems/goto/class_workstationService.inc:87
+msgid "manual/auto"
+msgstr ""
+
 #: admin/systems/goto/class_workstationService.inc:90
 #: admin/systems/goto/class_workstationService.inc:91
 #: admin/systems/goto/class_workstationService.inc:92
@@ -1874,36 +1877,36 @@ msgstr ""
 msgid "FAI status flag"
 msgstr ""
 
-#: admin/systems/goto/class_workstationStartup.inc:1293
+#: admin/systems/goto/class_workstationStartup.inc:1346
 msgid "Partition table"
 msgstr ""
 
-#: admin/systems/goto/class_workstationStartup.inc:1300
+#: admin/systems/goto/class_workstationStartup.inc:1353
 msgid "Package list"
 msgstr ""
 
-#: admin/systems/goto/class_workstationStartup.inc:1307
+#: admin/systems/goto/class_workstationStartup.inc:1360
 msgid "Scripts"
 msgstr ""
 
-#: admin/systems/goto/class_workstationStartup.inc:1314
+#: admin/systems/goto/class_workstationStartup.inc:1367
 msgid "Variables"
 msgstr ""
 
-#: admin/systems/goto/class_workstationStartup.inc:1321
+#: admin/systems/goto/class_workstationStartup.inc:1374
 msgid "Hooks"
 msgstr ""
 
-#: admin/systems/goto/class_workstationStartup.inc:1328
+#: admin/systems/goto/class_workstationStartup.inc:1381
 #: personal/environment/environment.tpl:145
 msgid "Profile"
 msgstr ""
 
-#: admin/systems/goto/class_workstationStartup.inc:1335
+#: admin/systems/goto/class_workstationStartup.inc:1388
 msgid "Templates"
 msgstr ""
 
-#: admin/systems/goto/class_workstationStartup.inc:1356
+#: admin/systems/goto/class_workstationStartup.inc:1409
 msgid "'repositoryBranchHook' returned no result!"
 msgstr ""
 
GONICUS system administrator (SVN clone)