From 6e47ef970bf8b9d88711756a7f56a0e3300f6203 Mon Sep 17 00:00:00 2001
From: psc <psc@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 17 Mar 2010 15:24:42 +0000
Subject: [PATCH] Apply fix for #4170

- Some changes to the debconf dialog:
  - Seperate HTML from the code which is used for rendering of each entry.
    This way formatting changes do not need to be done on every entry.
  - Add a checkbox in front of each entry to allow the user to control,
    which entry is updated in the LDAP and which not.
- Some changes to the debconf overview:
  - Add a new save button that is shown for values with defaults if
    they are currently saved to LDAP and an action for the blank button.
    This way the user can control weither a default value is saved to
    LDAP explicit or not.
- Some optimizations in data exchange between debconf overview
  and debconf dialog

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@16793 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../fai/admin/fai/class_debconfTemplate.inc   |  180 +-
 .../fai/class_faiDebconfConfigurations.inc    |  130 +-
 .../fai/admin/fai/class_faiPackage.inc        |   85 +-
 .../fai/class_faiPackageConfiguration.inc     |    3 +-
 .../fai/admin/fai/debconfTemplate_entry.tpl   |   15 +
 .../fai/locale/de/LC_MESSAGES/messages.po     |   98 +-
 trunk/gosa-plugins/fai/locale/messages.po     |   91 +-
 .../fai/locale/pl/LC_MESSAGES/messages.po     | 2205 +++++++++--------
 8 files changed, 1523 insertions(+), 1284 deletions(-)
 create mode 100644 trunk/gosa-plugins/fai/admin/fai/debconfTemplate_entry.tpl

diff --git a/trunk/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc b/trunk/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc
index 56dadcb21..eb0696efb 100644
--- a/trunk/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc
+++ b/trunk/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc
@@ -40,6 +40,7 @@ class debconf
         $name= trim(preg_replace("/^Template: (.*)$/", "\\1", $line));
         $this->template[$post_name]['Name'] = $name;
         $this->template[$post_name]['Default'] ="";
+        $this->template[$post_name]['Save'] = FALSE;
 
         $got_local_description= FALSE;
         continue;
@@ -133,6 +134,12 @@ class debconf
 
       /* Check if this var is set*/
       if(isset($_POST[$entry['post_name']])){
+        $checkbox_key = sprintf("save_%s", $entry['post_name']);
+        if (!isset($_POST[$checkbox_key])) {
+          $this->template[$post_name]['Save'] = FALSE;
+        }else {
+          $this->template[$post_name]['Save'] = TRUE;
+        }
 
         /* special handling for arrays */
         if(is_array($_POST[$entry['post_name']])){
@@ -165,13 +172,14 @@ class debconf
   }
 
 
-  /* This funtion sets the defualt value */
-  function SetDefault($var,$val)
+  /* This funtion sets the default value and the default save flag*/
+  function SetDefault($var,$val, $save_flag)
   {
     if ($this->loaded_template) {
       foreach($this->template as $key => $tmp){
         if($tmp['Name'] == $var ){
           $this->template[$key]['Default'] = $val;
+          $this->template[$key]['Save'] = $save_flag;
         }
       }
     }
@@ -199,7 +207,7 @@ class debconf
 
           $str = $this->$fn($entry);
           if(!empty($str)){
-            $result.=$str."<tr><td colspan='2'><p class='seperator'>&nbsp;</p></td></tr>";
+            $result.=$str."<tr><td colspan='3'><p class='seperator'>&nbsp;</p></td></tr>";
           }
         } else {
           //php_error(E_WARNING, "An unknown type has been specified in the debconf template. Please fix.");
@@ -215,72 +223,70 @@ class debconf
   }
 
 
+  function render_checkbox($data) {
+    $postname = $data['post_name'];
+    if (isset($data['Save'])) {
+      $save = $data['Save'];
+    } else {
+      $save = 0;
+    }
+
+    $checked="";
+    if ($save) {
+      $checked = "checked";
+    }
+    
+    $template = "<img src='images/save.png'><br><input type=checkbox name='save_%s' value='%s' %s>";
+    return(sprintf($template, $postname, $save, $checked));
+  }
+
   function render_boolean($data)
   {
     $post_name= $data['post_name'];
-    $result="
-      <tr>
-      <td valign='top' style='width:100%'>
-      <h2>".$data['Topic']."</h2>".$data['Description']."
-      </td>
-      <td style=\"white-space:nowrap; vertical-align:top; border-left: 1px solid rgb(160, 160, 160);\">";
+    $result = "";
+    $template = "<input type='radio' name=\"%s\" value=\"%s\" %s onChange='javascript:document.getElementsByName(\"save_%s\")[0].checked = true;'>%s";
 
     foreach(array("true","false") as $value){
       if($data['Default'] == $value){
-        $result.="<input type='radio' name='".$data['post_name']."' value=\"".$value."\" checked>"._($value);
+        $result.= sprintf($template, $data['post_name'], $value, "checked",  $data['post_name'], _($value));
       }else{
-        $result.="<input type='radio' name='".$data['post_name']."' value=\"".$value."\" >"._($value);
+        $result.= sprintf($template, $data['post_name'], $value, "", $data['post_name'], _($value));
       }
       $result.="<br>";
     }
-
-    $result.= "
-      </td>
-      </tr>
-      ";
-
-    return ($result);
+    return ($this->render_entry($data, $result));
   }
 
 
   function render_multiselect($data)
   {
     $post_name= $data['post_name'];
+    $input = "";
+       
     if (preg_match('/\$\{/', $data['Choices'])){
-      $data['Description'] .= '<br><br><b>' . _('This debconf question is dynamically generated during package installation and requires choosing between specific options which cannot be presented here. The entered text needs to be one of the valid choices in order to take effect.') . '</b>';
-      $result= $this->render_string($data);
+        $data['Description'] .= '<br><br><b>' . _('This debconf question is dynamically generated during package installation and requires choosing between specific options which cannot be presented here. The entered text needs to be one of the valid choices in order to take effect.') . '</b>';
+        return($this->render_string($data));
     } else {
-      $choices= "";
-      foreach (split(", ", $data['Choices']) as $choice){
-        $choices[]= $choice;
-      }
-
-
-      $result="
-        <tr>
-        <td valign='top'>
-        <h2>".$data['Topic']."</h2>".$data['Description']."
-        </td>
-        <td valign='top'  style=\"white-space:nowrap; border-left: 1px solid rgb(160, 160, 160);\">
-          <input type='hidden' name='multi-".$post_name."' value='1'>
-        ";
-        
-      $defs = split(", ",$data['Default']);
-      foreach($choices as $value){
-        if(in_array($value,$defs)){
-          $result.="\n<input name='".$post_name."-multi-".$value."' type='checkbox' value=\"".htmlentities($value)."\" checked>".$value."<br>";
-        }else{
-          $result.="\n<input name='".$post_name."-multi-".$value."' type='checkbox' value=\"".htmlentities($value)."\">".$value."<br>";
+        $choices= "";
+        foreach (split(", ", $data['Choices']) as $choice){
+            $choices[]= $choice;
+        }
+      
+        $input="<input type='hidden' name='multi-".$post_name."' value='1'>";
+        $template = "\n<input name='%s-multi-%s' type='checkbox' value=\"%s\" %s onChange='javascript:document.getElementsByName(\"save_%s\")[0].checked = true;'>%s";
+
+        $defs = split(", ",$data['Default']);
+        foreach($choices as $value){
+            if(in_array($value,$defs)){
+                $input .= sprintf($template, $post_name, $value, htmlentities($value), "checked", $post_name, _($value));
+            }else{
+                $input .= sprintf($template, $post_name, $value, $htmlentities($value), "", $post_name, _($value));
+            }
         }
-      }
 
-    $result .=    "</td>
-        </tr>
-        ";
     }    
-
-    return ($result);
-  }
+    return ($this->render_entry($data, $input));
+}
 
 
   function render_note($data)
@@ -293,71 +299,45 @@ class debconf
 
   function render_password($data)
   {
-    $result=  "";
-    $result.= "<tr><td valign='top'>";
-    $result.= "<h2>".$data['Topic']."</h2>".$data['Description']."</td><td style=\"white-space:nowrap; border-left: 1px solid rgb(160, 160, 160);\">&nbsp;<input type='text' name='".$data['post_name']."' value=\"".$data['Default']."\"></b><br><br>";
-    $result.= $data['Description'];
-    $result.= "</td>";
-
-    return ($result);
+    $result =  "";
+    $template = "&nbsp;<input type='text' name='%s' value=\"%s\" onChange='javascript:document.getElementsByName(\"save_%s\")[0].checked = true;'><br><br>";
+    $result .= sprintf($template, $data['post_name'], $data['Default'], $data['post_name']);
+    return ($this->render_entry($data, $result));
   }
 
 
   function render_select($data)
   {
     $post_name= $data['post_name'];
-
+    
+    $result = "";
     if (preg_match('/\$\{/', $data['Choices'])){
-      $result = $this->render_multiselect($data);
+        return($this->render_multiselect($data));
     } else {
-      $choices= "";
-      foreach (split(", ", $data['Choices']) as $choice){
-        $choices[]= $choice;
-      }
-
-
-      $result="
-        
-        <tr>
-        <td valign='top'>
-        <h2>".$data['Topic']."</h2>".$data['Description']."
-        </td>
-        <td  valign='top'  style=\"white-space:nowrap; border-left: 1px solid rgb(160, 160, 160);\">
-        ";
-
-      foreach($choices as $value){
-        if($data['Default'] == $value){
-          $result.="\n<input type='radio' name='".$post_name."' value=\"".htmlentities($value)."\" checked >".htmlentities($value)."<br>";
-        }else{
-          $result.="\n<input type='radio' name='".$post_name."' value=\"".htmlentities($value)."\">".htmlentities($value)."<br>";
+        $choices= "";
+        foreach (preg_split("/,\s?/", $data['Choices']) as $choice){
+            $choices[]= $choice;
         }
-      }
 
-      $result.= "
-        
-        </td>
-        </tr>
-        ";
+        $template = "\n<input type='radio' name='%s' value=\"%s\" %s onChange='javascript:document.getElementsByName(\"save_%s\")[0].checked = true;'>%s<br>";;
+        foreach($choices as $value){
+            if($data['Default'] == $value){
+                $result.= sprintf($template, $post_name, htmlentities($value), "checked", $post_name, htmlentities($value));
+            }else{
+                $result.= sprintf($template, $post_name, htmlentities($value), "", $post_name, htmlentities($value));
+            }
+        }
     }
 
-    return ($result);
+    return ($this->render_entry($data, $result));
   }
 
 
   function render_string($data)
   {
-    $result=  "
-                <tr>
-                  <td valign='top'>
-                    <h2>".$data['Topic']."</h2>".$data['Description']."
-                  </td>
-                  <td  style=\"white-space:nowrap; border-left: 1px solid rgb(160, 160, 160);\" valign='top'>
-                    <input type='text' name='".$data['post_name']."' value=\"".$data['Default']."\" style='width:300px;'>
-                  </td>
-                </tr>
-              ";
-
-    return ($result);
+    $template = "<input type='text' name='%s' value=\"%s\" style='width:300px' onChange='javascript:document.getElementsByName(\"save_%s\")[0].checked = true;'>";
+    $result=  sprintf($template, $data['post_name'], $data['Default'], $data['post_name']);
+    return ($this->render_entry($data, $result));
   }
 
 
@@ -374,6 +354,14 @@ class debconf
     return ("");
   }
 
+  function render_entry($data, $input) {
+    $smarty = get_smarty();
+    $smarty->assign('chkbox', $this->render_checkbox($data));
+    $smarty->assign('topic', $data['Topic']);
+    $smarty->assign('description', $data['Description']);
+    $smarty->assign('input', $input);
+    return($smarty->fetch (get_template_path('debconfTemplate_entry.tpl', TRUE)));
+  }
 }
 
 
diff --git a/trunk/gosa-plugins/fai/admin/fai/class_faiDebconfConfigurations.inc b/trunk/gosa-plugins/fai/admin/fai/class_faiDebconfConfigurations.inc
index a6a7e8ac6..b376993ca 100644
--- a/trunk/gosa-plugins/fai/admin/fai/class_faiDebconfConfigurations.inc
+++ b/trunk/gosa-plugins/fai/admin/fai/class_faiDebconfConfigurations.inc
@@ -41,7 +41,7 @@ class faiDebconfConfigurations extends plugin
 
       /* Get the list of configurations from the parent object */
       $this->DebconfConfigurations = $this->parent->ConfiguredPackages;
-      
+
       /* Load packages */
       foreach(array_keys($this->parent->usedPackages) as $package) {
           $this->packages[$package] = $package;
@@ -80,6 +80,7 @@ class faiDebconfConfigurations extends plugin
               $templates = $debconf_handle->template;
               unset($debconf_handle);
               foreach($templates as $template) {
+                $template['Save'] = FALSE;
                 if (!isset($this->DebconfDefaults[$package][$template['Name']])) {
                   $this->DebconfDefaults[$package][$template['Name']] = $template;
                 }
@@ -91,6 +92,30 @@ class faiDebconfConfigurations extends plugin
     }
 
 
+    /*! \brief Return a save toggle */
+    function getSaveToggle ($identifier) {
+      list($package, $name) = $this->getIdentifierComponents(base64_decode($identifier));
+
+      /* We do not need a save toggle for manually entered parameters */
+      if (isset($this->DebconfDefaults[$package][$name])) {
+        $template = "
+          <input type='hidden' name='save_%s' value='%s'>
+          <input type='image' src='%s' width='18' name='toggle_%s_%s' value='%s' title='%s'>
+          ";
+        if (isset($this->DebconfConfigurations[$package][$name])) {
+          if ($this->DebconfConfigurations[$package][$name]['Save'] == TRUE) {
+            return(sprintf($template, $identifier, '0', 'images/save.png', 'nosave', $identifier, '0', _("Currently saved")));
+          }
+          else {
+            return(sprintf($template, $identifier, '1', 'images/empty.png', 'save', $identifier, '1', _("Currently not saved")));
+          };
+        } else {
+            /* Defaults w/o corresponding configuration entry are not saved by default
+            * so give the user the chance to change that */
+            return(sprintf($template, $identifier, '1', 'images/empty.png', 'save', $identifier, '1', _("Currently not saved")));
+        }
+      }
+    } 
     /*! \brief  Returns a html interface, that allow to modify 
                  the package attributes.
         @return String  HTML content/ui for this plugin
@@ -139,7 +164,12 @@ class faiDebconfConfigurations extends plugin
             if(!in_array($type,array("boolean","multiselect","password","select","string","text"))){
               continue;
             }
-            $defaults[$package][$name] = array( 'Name' => $name, 'Value' => $value, 'Type' => $type);
+            $defaults[$package][$name] = array( 
+                                                 'Name' => $name,
+                                                 'Value' => $value, 
+                                                 'Type' => $type,
+                                                 'Save' => FALSE
+                                         );
         }
       }
       $this->DebconfAll = $this->DebconfConfigurations;
@@ -212,7 +242,7 @@ class faiDebconfConfigurations extends plugin
             if ($show_reset) {
                 $actions .= sprintf("$str_reset", $identifier);
             } elseif ($show_blank) {
-                $actions .= "<img src='images/empty.png' width=18>";
+                $actions .= $this->getSaveToggle($identifier);
             } else {
                 $actions .= sprintf("$str_delete", $identifier);
             }
@@ -239,7 +269,7 @@ class faiDebconfConfigurations extends plugin
         $field2 = array( "string" => $debconf_info['Name']);
         $field3 = array( "string" => $debconf_info['Type'],"attach" => "style='width:100px;'");
         $field4 = array( "string" => $input_field);
-        $field5 = array( "string" => $actions, "attach" => "style='width:50px; border-right:0px;'");
+        $field5 = array( "string" => $actions, "attach" => "style='width:60px; border-right:0px;'");
         $divlist->AddEntry(array($field1, $field2, $field3, $field4, $field5));
       }
     }
@@ -271,8 +301,19 @@ class faiDebconfConfigurations extends plugin
   function DeleteEntry($identifier) {
     list($package, $name) = $this->getIdentifierComponents($identifier);
     if (isset($this->DebconfConfigurations[$package][$name])) {
-      $this->to_remove[$package][$name] = $this->DebconfConfigurations[$package][$name];
-      unset($this->DebconfConfigurations[$package][$name]);
+      $this->DebconfConfigurations[$package][$name]['Save'] = FALSE;
+      if (!isset($this->DebconfDefaults[$package][$name])) {
+        $this->DebconfConfigurations[$package][$name]['Status'] = "removed";
+      } else {
+        $this->DebconfConfigurations[$package][$name]['Value'] = $this->DebconfDefaults[$package][$name]['Default'];
+      }
+    }
+
+    /* Check if the package entry is still justified */
+    if (is_array($this->DebconfConfigurations[$package])) {
+      if (!count($this->DebconfConfigurations[$package]) > 0) {
+        unset($this->DebconfConfigurations[$package]);
+      }
     }
   }
 
@@ -287,46 +328,44 @@ class faiDebconfConfigurations extends plugin
       $newval = $this->normalize_bool($newval);
     }
 
-    $this->DebconfConfigurations[$package][$name]['Value'] = $newval;
-
-    if (isset($this->DebconfDefaults[$package][$name])) {
-      $default_value = $this->DebconfDefaults[$package][$name]['Default'];
-
-      if ($default_value == $newval) {
-        $dn = "FAIvariable=".$name.",".$this->parent->dn;
-        $ldap = $this->config->get_ldap_link();
-        $ldap->cat($dn);
-        if ($ldap->count()) {
-          $attrs = $ldap->fetch();
-          if (isset($attrs['FAIvariableContent']) && $attrs['FAIvariableContent'][0] == $newval) {
-            /* Do not store default values unless its still a change compared to the LDAP */
-            unset($this->DebconfConfigurations[$package][$name]);
-          } else {
-            /* Values different from the default reset removal status */
-            unset($this->to_remove[$package][$name]);
-          }
-        } else {
-          unset($this->DebconfConfigurations[$package][$name]);
-        }
-      }
-      else {
-        /* Values different from the default reset removal status */
-        unset($this->to_remove[$package][$name]);
-      }
+    /* If the value changed, toggle the save flag */
+    $previous_value = "";
+    if (isset($this->DebconfConfigurations[$package][$name]['Value'])) {
+      $previous_value = $this->DebconfConfigurations[$package][$name]['Value'];
     }
     else {
-      /* This is no entry with a default value setting, so a new value removes
-       * the removal status */
-      if (isset($this->to_remove[$package][$name])) {
-        unset($this->to_remove[$package][$name]);
-      }
+      $previous_value = $this->DebconfConfigurations[$package][$name]['Default'];
+    }
+    if (is_array($previous_value)) {
+      $previous_value = "";
     }
 
+    if ($previous_value != $newval) {
+      $this->DebconfConfigurations[$package][$name]['Save'] = TRUE;
+    }
+
+    $this->DebconfConfigurations[$package][$name]['Value'] = $newval;
+
+
+    /* Set empty values to an array */
     if (isset($this->DebconfConfigurations[$package][$name]) && !$this->DebconfConfigurations[$package][$name]['Value']) {
         $this->DebconfConfigurations[$package][$name]['Value'] = array();
     }
   }
 
+  /*!\brief Toggle the save status of a given identifier */
+  function ToggleSave($identifier, $value) {
+    list($package, $name) = $this->getIdentifierComponents($identifier);
+
+    $save = ($value == 1) ? TRUE : FALSE;
+
+    if (!isset($this->DebconfConfigurations[$package][$name])) {
+      $this->DebconfConfigurations[$package][$name] = $this->DebconfDefaults[$package];
+    }
+
+    $this->DebconfConfigurations[$package][$name]['Save'] = $save;
+  }
+
   /* Save data to object */
   function save_object()
   {
@@ -347,6 +386,16 @@ class faiDebconfConfigurations extends plugin
     }
 
     foreach($_POST as $key => $value) {
+      if (preg_match("/^toggle_save_/", $key)) {
+        $identifier = base64_decode(str_replace("toggle_save_", "", $key));
+        $this->ToggleSave($identifier, 1);
+      }
+
+      if(preg_match("/^toggle_nosave_/", $key)) {
+        $identifier = base64_decode(str_replace("toggle_nosave_", "", $key));
+        $this->ToggleSave($identifier, 0);
+      }
+
       if (preg_match("/^reset_/", $key)) {
         $identifier = base64_decode(str_replace("reset_", "", $key));
         $this->DeleteEntry($identifier);
@@ -389,6 +438,7 @@ class faiDebconfConfigurations extends plugin
                         'Name' => $name,
                         'Value' => $new_config['FAIvariableContent'],
                         'Type' => $new_config['FAIvariableType'],
+                        'Save' => TRUE,
                         'Status' => 'manually_added',
                        );
           $this->DebconfConfigurations[$package][$name] = $data;
@@ -411,6 +461,7 @@ class faiDebconfConfigurations extends plugin
             foreach($result[$package] as $attr => $data) {
                 $identifier = sprintf("%s/%s", $package, $attr);
                 $this->UpdateEntry($identifier, $data['Value']);
+                $this->ToggleSave($identifier, $data['Save']);
             }
           }
         }
@@ -418,6 +469,7 @@ class faiDebconfConfigurations extends plugin
       $this->dialog = false;
       $this->is_dialog=false;
     }
+
   }
 
   /* Check supplied data */
@@ -429,6 +481,10 @@ class faiDebconfConfigurations extends plugin
 
     foreach($this->DebconfConfigurations as $package => $package_data) {
       foreach($package_data as $debconf_info) {
+        /* Do not show errors for values which are not saved to LDAP */
+        if (!$debconf_info['Save'] or (isset($debconf_info['Status']) && $debconf_info['Status']=='removed')) {
+          continue;
+        }
         if ($debconf_info['Type'] == 'boolean') {
           if (!empty($debconf_info['Value'])) {
             $value = strtolower($debconf_info['Value']);
diff --git a/trunk/gosa-plugins/fai/admin/fai/class_faiPackage.inc b/trunk/gosa-plugins/fai/admin/fai/class_faiPackage.inc
index f801ece82..ebc2e9664 100644
--- a/trunk/gosa-plugins/fai/admin/fai/class_faiPackage.inc
+++ b/trunk/gosa-plugins/fai/admin/fai/class_faiPackage.inc
@@ -23,7 +23,7 @@ class faiPackage extends plugin
   var $sub64coded       = array();
 
   var $ConfiguredPackages = array();
-  var $ConfigurationsToRemove = array();
+  var $Removal = array();
 
   /* Specific attributes */
   var $cn               = "";       // The class name for this object
@@ -111,6 +111,7 @@ class faiPackage extends plugin
         $tmp =array(); 
         $tmp['Name']  = $attr['FAIvariable'][0];
         $tmp['Type']  = $attr['FAIvariableType'][0];
+        $tmp['Save']  = TRUE;
 
         if (isset($attr['FAIvariableContent'][0])){
           if(!in_array($attr['FAIvariableType'],array("multiselect"))){
@@ -306,10 +307,20 @@ class faiPackage extends plugin
      */
     foreach($_POST as $name => $value){
 
+      /*****
+       * Remove configuration
+       *****/
+      if(!preg_match('/freeze/i', $this->FAIstate) && preg_match('/^remove_configuration_/', $name)){
+        $id = base64_decode(preg_replace("/^remove_configuration_(.*)_[xy]*$/","\\1",$name));
+        if(isset($this->ConfiguredPackages[$id])) {
+          $this->Removal[$id] = $this->ConfiguredPackages[$id];
+          unset($this->ConfiguredPackages[$id]);
+        }
+      }
+
       /******
        * Mark as removed  
        ******/
-      
       if(!preg_match('/freeze/i', $this->FAIstate) && preg_match("/^removal_package_/",$name)){
         $id = @base64_decode(preg_replace("/^removal_package_(.*)_[xy]*$/","\\1",$name));
         if(isset($this->usedPackages[$id])){
@@ -406,7 +417,23 @@ class faiPackage extends plugin
       } else {
         if(!preg_match("/^freeze/", $this->FAIstate)){
           $this->ConfiguredPackages= $this->dialog->save();
-          $this->ConfigurationsToRemove = $this->dialog->to_remove;
+          foreach($this->ConfiguredPackages as $package => $attrs) {
+            foreach($attrs as $name => $data) {
+              if (isset($data['Save']) && !($data['Save'])) {
+                $dn = "FAIvariable=".$name.",".$this->dn;
+                $ldap = $this->config->get_ldap_link();
+                $ldap->cat($dn);
+                if (!$ldap->count()) {
+                  unset($this->ConfiguredPackages[$package][$name]);
+                }
+              }
+            }
+            if (is_array($this->ConfiguredPackages[$package])) {
+              if (count($this->ConfiguredPackages[$package]) == 0) {
+                unset($this->ConfiguredPackages[$package]);
+              }
+            }
+          }
         }
         $this->dialog = false;
         $this->is_dialog = false;
@@ -445,8 +472,8 @@ class faiPackage extends plugin
         /* Append message if package is configured */
         $configured = "<img src='images/empty.png' alt=' '  class='center'>";
         if(isset($this->ConfiguredPackages[$usedName])){
-          $configured = "<img src='plugins/fai/images/package_configure.png' alt='"._("Configured")."'
-                      title='"._("Configured")."' class='center'>";
+          $configured = "<input type='image' name='remove_configuration_".base64_encode($usedName)."' src='plugins/fai/images/package_configure.png' title='"._("Remove configuration")."'
+            title='"._("Remove configuration")."' class='center'>";
         }
 
         /* Adapt used name if we're marked for removal */
@@ -650,6 +677,22 @@ class faiPackage extends plugin
     $ldap->cd($this->dn);
 
     /* Save Package configurations */
+    foreach($this->Removal as $pkgname => $attrs){
+      /* Skip entries which are back in the ConfiguredPackages array */
+      if (isset($this->ConfiguredPackages[$pkgname])) {
+        continue;
+      }
+      foreach($attrs as $name => $attr){
+        $dn = "FAIvariable=".$name.",".$this->dn;
+        $ldap = $this->config->get_ldap_link();
+        $ldap->cat($dn);
+        if ($ldap->count()) {
+          $ldap->cd($dn);
+          $ldap->rmdir($dn);
+        }
+      }
+    }
+
     foreach($this->ConfiguredPackages as $pkgname => $attrs){
       foreach($attrs as $name => $attr){
         $pkgattrs = array();
@@ -667,6 +710,28 @@ class faiPackage extends plugin
         $pkgattrs['FAIvariableContent']   = $attr['Value'];
         $pkgdn =  "FAIvariable=".$name.",".$this->dn;
 
+        if (!$attr['Save']) {
+          $ldap = $this->config->get_ldap_link();
+          $ldap->cat($pkgdn);
+          if ($ldap->count()) {
+            $ldap->cd($pkgdn);
+            $ldap->rmdir($pkgdn);
+          }
+          else {
+            unset($this->ConfiguredPackages[$pkgname][$name]);
+          }
+          if (is_array($this->ConfiguredPackages[$pkgname]) && count($this->ConfiguredPackages[$pkgname]) == 0) {
+            unset($this->ConfiguredPackages[$pkgname]);
+          }
+
+          continue;
+
+        }
+
+        if (empty($pkgattrs['FAIvariableContent'])) {
+          $pkgattrs['FAIvariableContent'] = array();
+        }
+
         if (is_array($pkgattrs['FAIvariableContent'])) {
           $ldap = $this->config->get_ldap_link();
           $ldap->cat($pkgdn);
@@ -691,16 +756,6 @@ class faiPackage extends plugin
         }
       }
     }
-
-    /* Remove obsolete configurations */
-    foreach($this->ConfigurationsToRemove as $package => $attr) {
-      foreach($attr as $name => $attr) {
-        $dn = "FAIvariable=".$name.",".$this->dn;
-        $ldap = $this->config->get_ldap_link();
-        $ldap->cd($dn);
-        $ldap->rmdir($dn);
-      }
-    }
   }
 
 
diff --git a/trunk/gosa-plugins/fai/admin/fai/class_faiPackageConfiguration.inc b/trunk/gosa-plugins/fai/admin/fai/class_faiPackageConfiguration.inc
index d0e0df3c5..49d9387b7 100644
--- a/trunk/gosa-plugins/fai/admin/fai/class_faiPackageConfiguration.inc
+++ b/trunk/gosa-plugins/fai/admin/fai/class_faiPackageConfiguration.inc
@@ -51,7 +51,7 @@ class faiPackageConfiguration extends plugin
         if (is_array($var['Value'])) {
           $var['Value'] = "";
         }
-        $this->Debconf_handle->SetDefault($var['Name'],$var['Value']);
+        $this->Debconf_handle->SetDefault($var['Name'],$var['Value'], $var['Save']);
       }
     }
   }
@@ -101,6 +101,7 @@ class faiPackageConfiguration extends plugin
       $tmp[$this->obj][$pkg['Name']]['Value']= $pkg['Default'];
       $tmp[$this->obj][$pkg['Name']]['Name'] = $pkg['Name'];
       $tmp[$this->obj][$pkg['Name']]['Type'] = $pkg['Type'];
+      $tmp[$this->obj][$pkg['Name']]['Save'] = $pkg['Save'];
     }
     return($tmp);
   }
diff --git a/trunk/gosa-plugins/fai/admin/fai/debconfTemplate_entry.tpl b/trunk/gosa-plugins/fai/admin/fai/debconfTemplate_entry.tpl
new file mode 100644
index 000000000..f83fd0974
--- /dev/null
+++ b/trunk/gosa-plugins/fai/admin/fai/debconfTemplate_entry.tpl
@@ -0,0 +1,15 @@
+<!-- xxx !-->
+<tr>
+    <td valign='top' style='vertical-align:center; border-right: 1px solid rgb(160,160,160); text-align: center;'>
+        {$chkbox}
+    </td>
+    
+    <td valign='top' style='width:85%'>
+        <h2>{$topic}</h2>
+        {$description}
+    </td>
+
+    <td style='white-space: nowrap; vertical-align:top; border-left: 1px solid rgb(160, 160,160)'>
+    {$input}
+    </td>
+</tr>
diff --git a/trunk/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po b/trunk/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po
index aa070ab39..a4298750a 100644
--- a/trunk/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po
+++ b/trunk/gosa-plugins/fai/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: 2010-03-15 11:14+0100\n"
+"POT-Creation-Date: 2010-03-17 16:04+0100\n"
 "PO-Revision-Date: 2008-12-04 11:27+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
@@ -42,7 +42,7 @@ msgstr "Sie können diese Erweiterung erst verwenden, wenn FAI aktiviert wurde."
 #: admin/fai/class_faiSummaryTab.inc:89
 #: admin/fai/class_faiPartitionTable.inc:173 admin/fai/tabsHook.inc:32
 #: admin/fai/class_faiTemplate.inc:208
-#: admin/fai/class_faiDebconfConfigurations.inc:341
+#: admin/fai/class_faiDebconfConfigurations.inc:430
 #: admin/fai/tabsProfile.inc:33 admin/fai/class_faiManagement.inc:238
 #: admin/fai/class_faiManagement.inc:614 admin/fai/class_faiManagement.inc:620
 #: admin/fai/class_faiManagement.inc:906 admin/fai/class_faiManagement.inc:950
@@ -54,8 +54,8 @@ msgstr "Sie können diese Erweiterung erst verwenden, wenn FAI aktiviert wurde."
 #: admin/fai/tabsTemplate.inc:33 admin/fai/class_FAI.inc:548
 #: admin/fai/class_faiHook.inc:233 admin/fai/class_faiProfile.inc:263
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
-#: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiPackage.inc:367
-#: admin/fai/class_faiPackage.inc:400 admin/fai/tabsVariable.inc:33
+#: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:415 admin/fai/tabsVariable.inc:33
 msgid "Error"
 msgstr "Fehler"
 
@@ -91,8 +91,8 @@ msgstr "FAI Release"
 #: admin/fai/class_faiVariable.inc:397 admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
-#: admin/fai/class_faiVariableEntry.inc:137 admin/fai/class_faiPackage.inc:572
-#: admin/fai/class_faiPackage.inc:707 admin/fai/faiPartitionTable.tpl:9
+#: admin/fai/class_faiVariableEntry.inc:137 admin/fai/class_faiPackage.inc:603
+#: admin/fai/class_faiPackage.inc:776 admin/fai/faiPartitionTable.tpl:9
 #: admin/fai/faiPartitionTableEntry.tpl:6 admin/fai/faiProfile.tpl:9
 msgid "Name"
 msgstr "Name"
@@ -101,7 +101,7 @@ msgstr "Name"
 #: admin/fai/class_faiDebconfConfigurations.inc:71
 #: admin/fai/class_faiManagement.inc:788
 #: admin/fai/class_faiPackageConfiguration.inc:35 admin/fai/class_FAI.inc:566
-#: admin/fai/class_faiPackage.inc:269 admin/fai/class_faiPackage.inc:594
+#: admin/fai/class_faiPackage.inc:274 admin/fai/class_faiPackage.inc:625
 #: admin/fai/class_faiPackageEntry.inc:53
 #: admin/fai/class_faiPackageEntry.inc:193
 msgid "Service infrastructure"
@@ -144,7 +144,7 @@ msgstr "Sektionen"
 #: admin/systems/services/repository/servRepositorySetup.tpl:19
 #: admin/systems/services/repository/class_divListRepositories.inc:23
 #: admin/fai/faiPackage.tpl:37 admin/fai/branch_selector.tpl:25
-#: admin/fai/class_faiPackage.inc:713
+#: admin/fai/class_faiPackage.inc:782
 msgid "Release"
 msgstr "Release"
 
@@ -172,9 +172,9 @@ msgid "Add repository"
 msgstr "Repository hinzufügen"
 
 #: admin/fai/faiPackageConfiguration.tpl:1
-#: admin/fai/class_faiDebconfConfigurations.inc:115
+#: admin/fai/class_faiDebconfConfigurations.inc:140
 #: admin/fai/NewDebconfConfiguration.tpl:16 admin/fai/class_divListFai.inc:68
-#: admin/fai/faiDebconfConfigurations.tpl:1 admin/fai/class_faiPackage.inc:699
+#: admin/fai/faiDebconfConfigurations.tpl:1 admin/fai/class_faiPackage.inc:768
 msgid "Package"
 msgstr "Paket"
 
@@ -258,7 +258,7 @@ msgstr "Mount-Punkt"
 
 #: admin/fai/class_faiSummaryTab.inc:348
 #: admin/fai/class_faiPartitionTableEntry.inc:183
-#: admin/fai/class_faiDebconfConfigurations.inc:117
+#: admin/fai/class_faiDebconfConfigurations.inc:142
 #: admin/fai/NewDebconfConfiguration.tpl:22
 msgid "Type"
 msgstr "Typ"
@@ -294,7 +294,7 @@ msgstr "Nur Lesen"
 #: admin/fai/faiHookEntry.tpl:19 admin/fai/faiHook.tpl:21
 #: admin/fai/class_faiHook.inc:553 admin/fai/class_faiProfile.inc:498
 #: admin/fai/class_faiHookEntry.inc:197 admin/fai/class_faiVariable.inc:398
-#: admin/fai/class_faiVariableEntry.inc:138 admin/fai/class_faiPackage.inc:708
+#: admin/fai/class_faiVariableEntry.inc:138 admin/fai/class_faiPackage.inc:777
 #: admin/fai/faiPartitionTable.tpl:21 admin/fai/faiPartitionTableEntry.tpl:13
 #: admin/fai/faiProfile.tpl:21
 msgid "Description"
@@ -359,7 +359,7 @@ msgstr "Zeige die Objekte, auf die Folgendes passt"
 msgid "Generic"
 msgstr "Allgemein"
 
-#: admin/fai/faiPackage.tpl:45 admin/fai/class_faiPackage.inc:710
+#: admin/fai/faiPackage.tpl:45 admin/fai/class_faiPackage.inc:779
 msgid "Section"
 msgstr "Section"
 
@@ -545,7 +545,7 @@ msgid "FAI template"
 msgstr "FAI-Vorlage"
 
 #: admin/fai/class_faiTemplate.inc:537 admin/fai/class_faiScript.inc:637
-#: admin/fai/class_faiPackage.inc:710 admin/fai/class_faiPackage.inc:713
+#: admin/fai/class_faiPackage.inc:779 admin/fai/class_faiPackage.inc:782
 msgid "Readonly"
 msgstr "Nur Lesen"
 
@@ -625,45 +625,56 @@ msgid "Choose a variable to delete or edit"
 msgstr "Wählen Sie eine Variable zum Entfernen oder Bearbeiten"
 
 #: admin/fai/faiVariable.tpl:53
-#: admin/fai/class_faiDebconfConfigurations.inc:127
+#: admin/fai/class_faiDebconfConfigurations.inc:152
 #: admin/fai/class_faiHook.inc:306 admin/fai/class_faiHook.inc:308
 #: admin/fai/faiPartitionTable.tpl:54
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: admin/fai/class_faiDebconfConfigurations.inc:116
+#: admin/fai/class_faiDebconfConfigurations.inc:107
+msgid "Currently saved"
+msgstr "Wird aktuell gespeichert"
+
+#: admin/fai/class_faiDebconfConfigurations.inc:110
+#: admin/fai/class_faiDebconfConfigurations.inc:115
+msgid "Currently not saved"
+msgstr "Wird aktuell nicht gespeichert"
+
+#: admin/fai/class_faiDebconfConfigurations.inc:141
 #: admin/fai/NewDebconfConfiguration.tpl:19 admin/fai/class_divListFai.inc:60
 #: admin/fai/class_divListFai.inc:66 admin/fai/class_faiVariable.inc:389
 msgid "Variable"
 msgstr "Variable"
 
-#: admin/fai/class_faiDebconfConfigurations.inc:118
+#: admin/fai/class_faiDebconfConfigurations.inc:143
 #: admin/fai/NewDebconfConfiguration.tpl:25
 #: admin/fai/NewDebconfConfiguration.tpl:43
 msgid "Value"
 msgstr "Wert"
 
-#: admin/fai/class_faiDebconfConfigurations.inc:123
+#: admin/fai/class_faiDebconfConfigurations.inc:148
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: admin/fai/class_faiDebconfConfigurations.inc:125
+#: admin/fai/class_faiDebconfConfigurations.inc:150
 #: admin/fai/class_faiHook.inc:310
 msgid "Delete"
 msgstr "Entfernen"
 
-#: admin/fai/class_faiDebconfConfigurations.inc:218
+#: admin/fai/class_faiDebconfConfigurations.inc:279
 #, php-format
 msgid "Debconf information for package list '%s'"
 msgstr "Debconf-Informationen für Paketliste '%s'"
 
-#: admin/fai/class_faiDebconfConfigurations.inc:400
+#: admin/fai/class_faiDebconfConfigurations.inc:496
 #, php-format
 msgid ""
 "The specified value '%s' for variable '%s' is not valid with the specified "
 "boolean variable type.<br><i>Allowed values: true, false, 1, 0.</i>"
-msgstr "Der angegebene Wert '%s' in der Variable '%s' ist mit dem angegebenen "
-"Variablen-Typ boolean nicht zulässig.<br><i>Erlaubte Werte: true, false, 1, 0.</i>"
+msgstr ""
+"Der angegebene Wert '%s' in der Variable '%s' ist mit dem angegebenen "
+"Variablen-Typ boolean nicht zulässig.<br><i>Erlaubte Werte: true, false, 1, "
+"0.</i>"
 
 #: admin/fai/class_askClassName.inc:79 admin/fai/class_askClassName.inc:80
 #: admin/fai/class_askClassName.inc:81 admin/fai/class_askClassName.inc:82
@@ -1147,11 +1158,11 @@ msgstr "Localboot-Produkte"
 msgid "List of scripts"
 msgstr "Liste der Skripte"
 
-#: admin/fai/class_debconfTemplate.inc:213
+#: admin/fai/class_debconfTemplate.inc:221
 msgid "This package has no debconf options."
 msgstr "Dieses Paket verfügt über keine debconf-Optionen."
 
-#: admin/fai/class_debconfTemplate.inc:250
+#: admin/fai/class_debconfTemplate.inc:267
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -1320,7 +1331,7 @@ msgstr "Datei-Berechtigungen"
 msgid "List of template files"
 msgstr "Liste der Vorlagen"
 
-#: admin/fai/class_faiPackageConfiguration.inc:68
+#: admin/fai/class_faiPackageConfiguration.inc:71
 #, php-format
 msgid "Debconf information for package '%s'"
 msgstr "Debconf-Information für Paket '%s'"
@@ -1333,12 +1344,13 @@ msgstr "Hinzufügen"
 msgid "OPSI local product"
 msgstr "OPSI Local-Produkt"
 
-#: admin/fai/class_NewDebconfConfiguration.inc:122
+#: admin/fai/class_NewDebconfConfiguration.inc:119
 #, php-format
 msgid ""
 "The specified value '%s' for the variable type boolean is invalid."
 "<br><i>Allowed values: true, false, 1, 0.</i>"
-msgstr "Der angegebene Wert '%s' für den Variablen-Typ Boolean ist unzulässig."
+msgstr ""
+"Der angegebene Wert '%s' für den Variablen-Typ Boolean ist unzulässig."
 "<br><i>Erlaubte Werte: true, false, 1, 0.</i>"
 
 #: admin/fai/faiHookEntry.tpl:33 admin/fai/faiHookEntry.tpl:54
@@ -1481,59 +1493,59 @@ msgstr "Variablen-Eintrag"
 msgid "FAI variable entry "
 msgstr "FAI-Variablen-Eintrag"
 
-#: admin/fai/class_faiPackage.inc:232
+#: admin/fai/class_faiPackage.inc:237
 msgid "Invalid package names"
 msgstr "Ungültige Paketnamen"
 
-#: admin/fai/class_faiPackage.inc:233
+#: admin/fai/class_faiPackage.inc:238
 #, php-format
 msgid "The following package names don't match the Debian policy: %s"
 msgstr "Die folgenden Paketnamen entsprechen nicht der Debian policy: %s"
 
-#: admin/fai/class_faiPackage.inc:444 admin/fai/class_faiPackage.inc:445
-msgid "Configured"
-msgstr "Konfiguriert"
+#: admin/fai/class_faiPackage.inc:475 admin/fai/class_faiPackage.inc:476
+msgid "Remove configuration"
+msgstr "Konfiguration löschen"
 
-#: admin/fai/class_faiPackage.inc:451 admin/fai/class_faiPackage.inc:452
+#: admin/fai/class_faiPackage.inc:482 admin/fai/class_faiPackage.inc:483
 msgid "Package marked for removal"
 msgstr "Paket zum Entfernen vorgemerkt"
 
-#: admin/fai/class_faiPackage.inc:468
+#: admin/fai/class_faiPackage.inc:499
 msgid "Mark package for removal"
 msgstr "Paket zum Entfernen vormerken"
 
-#: admin/fai/class_faiPackage.inc:474
+#: admin/fai/class_faiPackage.inc:505
 msgid "Configure this package"
 msgstr "Dieses Paket konfigurieren"
 
-#: admin/fai/class_faiPackage.inc:478
+#: admin/fai/class_faiPackage.inc:509
 msgid "Remove this package"
 msgstr "Dieses Paket entfernen"
 
-#: admin/fai/class_faiPackage.inc:558
+#: admin/fai/class_faiPackage.inc:589
 msgid "Please select a least one package!"
 msgstr "Bitte wählen Sie mindestens ein Paket!"
 
-#: admin/fai/class_faiPackage.inc:562
+#: admin/fai/class_faiPackage.inc:593
 msgid ""
 "Please choose a valid release/section combination for your repository setup!"
 msgstr ""
 "Bitte wählen Sie eine gültige Kombination aus Release und Sektion für Ihr "
 "gewünschtes Repository!"
 
-#: admin/fai/class_faiPackage.inc:700
+#: admin/fai/class_faiPackage.inc:769
 msgid "FAI Package list"
 msgstr "FAI-Paketliste"
 
-#: admin/fai/class_faiPackage.inc:709
+#: admin/fai/class_faiPackage.inc:778
 msgid "Packages"
 msgstr "Pakete"
 
-#: admin/fai/class_faiPackage.inc:711
+#: admin/fai/class_faiPackage.inc:780
 msgid "Install Method"
 msgstr "Installations-Methode"
 
-#: admin/fai/class_faiPackage.inc:712
+#: admin/fai/class_faiPackage.inc:781
 msgid "Package configuration"
 msgstr "Paket-Konfiguration"
 
diff --git a/trunk/gosa-plugins/fai/locale/messages.po b/trunk/gosa-plugins/fai/locale/messages.po
index 009b5154e..37ba1a566 100644
--- a/trunk/gosa-plugins/fai/locale/messages.po
+++ b/trunk/gosa-plugins/fai/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-15 11:14+0100\n"
+"POT-Creation-Date: 2010-03-17 16:04+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"
@@ -36,7 +36,7 @@ msgstr ""
 #: admin/fai/class_faiSummaryTab.inc:89
 #: admin/fai/class_faiPartitionTable.inc:173 admin/fai/tabsHook.inc:32
 #: admin/fai/class_faiTemplate.inc:208
-#: admin/fai/class_faiDebconfConfigurations.inc:341
+#: admin/fai/class_faiDebconfConfigurations.inc:430
 #: admin/fai/tabsProfile.inc:33 admin/fai/class_faiManagement.inc:238
 #: admin/fai/class_faiManagement.inc:614 admin/fai/class_faiManagement.inc:620
 #: admin/fai/class_faiManagement.inc:906 admin/fai/class_faiManagement.inc:950
@@ -48,8 +48,8 @@ msgstr ""
 #: admin/fai/tabsTemplate.inc:33 admin/fai/class_FAI.inc:548
 #: admin/fai/class_faiHook.inc:233 admin/fai/class_faiProfile.inc:263
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
-#: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiPackage.inc:367
-#: admin/fai/class_faiPackage.inc:400 admin/fai/tabsVariable.inc:33
+#: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:415 admin/fai/tabsVariable.inc:33
 msgid "Error"
 msgstr ""
 
@@ -85,8 +85,8 @@ msgstr ""
 #: admin/fai/class_faiVariable.inc:397 admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
-#: admin/fai/class_faiVariableEntry.inc:137 admin/fai/class_faiPackage.inc:572
-#: admin/fai/class_faiPackage.inc:707 admin/fai/faiPartitionTable.tpl:9
+#: admin/fai/class_faiVariableEntry.inc:137 admin/fai/class_faiPackage.inc:603
+#: admin/fai/class_faiPackage.inc:776 admin/fai/faiPartitionTable.tpl:9
 #: admin/fai/faiPartitionTableEntry.tpl:6 admin/fai/faiProfile.tpl:9
 msgid "Name"
 msgstr ""
@@ -95,7 +95,7 @@ msgstr ""
 #: admin/fai/class_faiDebconfConfigurations.inc:71
 #: admin/fai/class_faiManagement.inc:788
 #: admin/fai/class_faiPackageConfiguration.inc:35 admin/fai/class_FAI.inc:566
-#: admin/fai/class_faiPackage.inc:269 admin/fai/class_faiPackage.inc:594
+#: admin/fai/class_faiPackage.inc:274 admin/fai/class_faiPackage.inc:625
 #: admin/fai/class_faiPackageEntry.inc:53
 #: admin/fai/class_faiPackageEntry.inc:193
 msgid "Service infrastructure"
@@ -138,7 +138,7 @@ msgstr ""
 #: admin/systems/services/repository/servRepositorySetup.tpl:19
 #: admin/systems/services/repository/class_divListRepositories.inc:23
 #: admin/fai/faiPackage.tpl:37 admin/fai/branch_selector.tpl:25
-#: admin/fai/class_faiPackage.inc:713
+#: admin/fai/class_faiPackage.inc:782
 msgid "Release"
 msgstr ""
 
@@ -164,9 +164,9 @@ msgid "Add repository"
 msgstr ""
 
 #: admin/fai/faiPackageConfiguration.tpl:1
-#: admin/fai/class_faiDebconfConfigurations.inc:115
+#: admin/fai/class_faiDebconfConfigurations.inc:140
 #: admin/fai/NewDebconfConfiguration.tpl:16 admin/fai/class_divListFai.inc:68
-#: admin/fai/faiDebconfConfigurations.tpl:1 admin/fai/class_faiPackage.inc:699
+#: admin/fai/faiDebconfConfigurations.tpl:1 admin/fai/class_faiPackage.inc:768
 msgid "Package"
 msgstr ""
 
@@ -250,7 +250,7 @@ msgstr ""
 
 #: admin/fai/class_faiSummaryTab.inc:348
 #: admin/fai/class_faiPartitionTableEntry.inc:183
-#: admin/fai/class_faiDebconfConfigurations.inc:117
+#: admin/fai/class_faiDebconfConfigurations.inc:142
 #: admin/fai/NewDebconfConfiguration.tpl:22
 msgid "Type"
 msgstr ""
@@ -286,7 +286,7 @@ msgstr ""
 #: admin/fai/faiHookEntry.tpl:19 admin/fai/faiHook.tpl:21
 #: admin/fai/class_faiHook.inc:553 admin/fai/class_faiProfile.inc:498
 #: admin/fai/class_faiHookEntry.inc:197 admin/fai/class_faiVariable.inc:398
-#: admin/fai/class_faiVariableEntry.inc:138 admin/fai/class_faiPackage.inc:708
+#: admin/fai/class_faiVariableEntry.inc:138 admin/fai/class_faiPackage.inc:777
 #: admin/fai/faiPartitionTable.tpl:21 admin/fai/faiPartitionTableEntry.tpl:13
 #: admin/fai/faiProfile.tpl:21
 msgid "Description"
@@ -349,7 +349,7 @@ msgstr ""
 msgid "Generic"
 msgstr ""
 
-#: admin/fai/faiPackage.tpl:45 admin/fai/class_faiPackage.inc:710
+#: admin/fai/faiPackage.tpl:45 admin/fai/class_faiPackage.inc:779
 msgid "Section"
 msgstr ""
 
@@ -522,7 +522,7 @@ msgid "FAI template"
 msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:537 admin/fai/class_faiScript.inc:637
-#: admin/fai/class_faiPackage.inc:710 admin/fai/class_faiPackage.inc:713
+#: admin/fai/class_faiPackage.inc:779 admin/fai/class_faiPackage.inc:782
 msgid "Readonly"
 msgstr ""
 
@@ -587,43 +587,52 @@ msgid "Choose a variable to delete or edit"
 msgstr ""
 
 #: admin/fai/faiVariable.tpl:53
-#: admin/fai/class_faiDebconfConfigurations.inc:127
+#: admin/fai/class_faiDebconfConfigurations.inc:152
 #: admin/fai/class_faiHook.inc:306 admin/fai/class_faiHook.inc:308
 #: admin/fai/faiPartitionTable.tpl:54
 msgid "Edit"
 msgstr ""
 
-#: admin/fai/class_faiDebconfConfigurations.inc:116
+#: admin/fai/class_faiDebconfConfigurations.inc:107
+msgid "Currently saved"
+msgstr ""
+
+#: admin/fai/class_faiDebconfConfigurations.inc:110
+#: admin/fai/class_faiDebconfConfigurations.inc:115
+msgid "Currently not saved"
+msgstr ""
+
+#: admin/fai/class_faiDebconfConfigurations.inc:141
 #: admin/fai/NewDebconfConfiguration.tpl:19 admin/fai/class_divListFai.inc:60
 #: admin/fai/class_divListFai.inc:66 admin/fai/class_faiVariable.inc:389
 msgid "Variable"
 msgstr ""
 
-#: admin/fai/class_faiDebconfConfigurations.inc:118
+#: admin/fai/class_faiDebconfConfigurations.inc:143
 #: admin/fai/NewDebconfConfiguration.tpl:25
 #: admin/fai/NewDebconfConfiguration.tpl:43
 msgid "Value"
 msgstr ""
 
-#: admin/fai/class_faiDebconfConfigurations.inc:123
+#: admin/fai/class_faiDebconfConfigurations.inc:148
 msgid "Reset"
 msgstr ""
 
-#: admin/fai/class_faiDebconfConfigurations.inc:125
+#: admin/fai/class_faiDebconfConfigurations.inc:150
 #: admin/fai/class_faiHook.inc:310
 msgid "Delete"
 msgstr ""
 
-#: admin/fai/class_faiDebconfConfigurations.inc:218
+#: admin/fai/class_faiDebconfConfigurations.inc:279
 #, php-format
 msgid "Debconf information for package list '%s'"
 msgstr ""
 
-#: admin/fai/class_faiDebconfConfigurations.inc:400
+#: admin/fai/class_faiDebconfConfigurations.inc:496
 #, php-format
 msgid ""
 "The specified value '%s' for variable '%s' is not valid with the specified "
-"boolean variable type.<br><i>Allowed values: true, false, 1, 0."
+"boolean variable type.<br><i>Allowed values: true, false, 1, 0.</i>"
 msgstr ""
 
 #: admin/fai/class_askClassName.inc:79 admin/fai/class_askClassName.inc:80
@@ -1087,11 +1096,11 @@ msgstr ""
 msgid "List of scripts"
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:213
+#: admin/fai/class_debconfTemplate.inc:221
 msgid "This package has no debconf options."
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:250
+#: admin/fai/class_debconfTemplate.inc:267
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -1254,7 +1263,7 @@ msgstr ""
 msgid "List of template files"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:68
+#: admin/fai/class_faiPackageConfiguration.inc:71
 #, php-format
 msgid "Debconf information for package '%s'"
 msgstr ""
@@ -1267,11 +1276,11 @@ msgstr ""
 msgid "OPSI local product"
 msgstr ""
 
-#: admin/fai/class_NewDebconfConfiguration.inc:122
+#: admin/fai/class_NewDebconfConfiguration.inc:119
 #, php-format
 msgid ""
 "The specified value '%s' for the variable type boolean is invalid."
-"<br><i>Allowed values: true, false, 1, 0."
+"<br><i>Allowed values: true, false, 1, 0.</i>"
 msgstr ""
 
 #: admin/fai/faiHookEntry.tpl:33 admin/fai/faiHookEntry.tpl:54
@@ -1413,57 +1422,57 @@ msgstr ""
 msgid "FAI variable entry "
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:232
+#: admin/fai/class_faiPackage.inc:237
 msgid "Invalid package names"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:233
+#: admin/fai/class_faiPackage.inc:238
 #, php-format
 msgid "The following package names don't match the Debian policy: %s"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:444 admin/fai/class_faiPackage.inc:445
-msgid "Configured"
+#: admin/fai/class_faiPackage.inc:475 admin/fai/class_faiPackage.inc:476
+msgid "Remove configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:451 admin/fai/class_faiPackage.inc:452
+#: admin/fai/class_faiPackage.inc:482 admin/fai/class_faiPackage.inc:483
 msgid "Package marked for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:468
+#: admin/fai/class_faiPackage.inc:499
 msgid "Mark package for removal"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:474
+#: admin/fai/class_faiPackage.inc:505
 msgid "Configure this package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:478
+#: admin/fai/class_faiPackage.inc:509
 msgid "Remove this package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:558
+#: admin/fai/class_faiPackage.inc:589
 msgid "Please select a least one package!"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:562
+#: admin/fai/class_faiPackage.inc:593
 msgid ""
 "Please choose a valid release/section combination for your repository setup!"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:700
+#: admin/fai/class_faiPackage.inc:769
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:709
+#: admin/fai/class_faiPackage.inc:778
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:711
+#: admin/fai/class_faiPackage.inc:780
 msgid "Install Method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:712
+#: admin/fai/class_faiPackage.inc:781
 msgid "Package configuration"
 msgstr ""
 
diff --git a/trunk/gosa-plugins/fai/locale/pl/LC_MESSAGES/messages.po b/trunk/gosa-plugins/fai/locale/pl/LC_MESSAGES/messages.po
index 9379641c1..13fa1af40 100644
--- a/trunk/gosa-plugins/fai/locale/pl/LC_MESSAGES/messages.po
+++ b/trunk/gosa-plugins/fai/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-19 08:30+0100\n"
+"POT-Creation-Date: 2010-03-17 08:48+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -14,229 +14,388 @@ msgstr ""
 "X-Poedit-SourceCharset: iso-8859-2\n"
 "X-Poedit-Basepath: tedst\n"
 
-#: admin/fai/faiTemplateEntry.tpl:3 admin/fai/faiVariable.tpl:4
-#: admin/fai/faiProfile.tpl:4 admin/fai/faiProfile.tpl:36
-#: admin/fai/faiScriptEntry.tpl:5 admin/fai/faiScript.tpl:4
-#: admin/fai/faiPackage.tpl:4 admin/fai/faiHook.tpl:4
-#: admin/fai/faiPartitionTableEntry.tpl:2 admin/fai/faiHookEntry.tpl:5
-#: admin/fai/faiTemplate.tpl:4 admin/fai/faiVariableEntry.tpl:5
-#: admin/fai/faiPartitionTable.tpl:4
-msgid "Generic"
-msgstr "Ogólne"
-
-#: admin/fai/faiTemplateEntry.tpl:10 admin/fai/class_faiTemplateEntry.inc:220
+#: admin/systems/services/repository/class_servRepository.inc:26
+#: admin/systems/services/repository/class_servRepository.inc:260
+#: admin/systems/services/repository/class_servRepository.inc:334
+#: admin/systems/services/repository/class_servRepository.inc:370
+#: admin/systems/services/repository/class_servRepositorySetup.inc:204
 #, fuzzy
-msgid "File name"
-msgstr "Nazwa pliku"
+msgid "Repository service"
+msgstr "Repozytorium"
 
-#: admin/fai/faiTemplateEntry.tpl:21 admin/fai/class_faiTemplateEntry.inc:215
-msgid "Destination path"
-msgstr "Ścieżka docelowa"
+#: admin/systems/services/repository/class_servRepository.inc:93
+#: admin/fai/class_faiSummaryTab.inc:178
+msgid "You can't use this plugin until FAI is activated."
+msgstr ""
 
-#: admin/fai/faiTemplateEntry.tpl:33
-#: admin/fai/class_faiPartitionTableEntry.inc:470 admin/fai/faiVariable.tpl:21
-#: admin/fai/class_faiHook.inc:562 admin/fai/faiProfile.tpl:21
-#: admin/fai/faiScriptEntry.tpl:19 admin/fai/faiScript.tpl:21
-#: admin/fai/faiPackage.tpl:21 admin/fai/faiHook.tpl:21
-#: admin/fai/class_faiProfile.inc:479 admin/fai/faiPartitionTableEntry.tpl:13
-#: admin/fai/faiHookEntry.tpl:19 admin/fai/class_faiVariableEntry.inc:138
-#: admin/fai/class_faiTemplate.inc:545 admin/fai/class_faiScript.inc:646
-#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/faiTemplate.tpl:21
-#: admin/fai/class_faiPartitionTable.inc:550 admin/fai/faiVariableEntry.tpl:19
-#: admin/fai/class_faiHookEntry.inc:197 admin/fai/class_faiVariable.inc:398
-#: admin/fai/class_faiPackage.inc:582 admin/fai/class_faiTemplateEntry.inc:274
-#: admin/fai/faiPartitionTable.tpl:21
-msgid "Description"
-msgstr "Opis"
+#: admin/systems/services/repository/class_servRepository.inc:142
+#: admin/systems/services/repository/class_servRepository.inc:177
+#: admin/systems/services/repository/class_servRepository.inc:182
+#: admin/systems/services/repository/class_servRepositorySetup.inc:204
+#: admin/fai/class_faiSummaryTab.inc:89
+#: admin/fai/class_faiPartitionTable.inc:173 admin/fai/tabsHook.inc:32
+#: admin/fai/class_faiTemplate.inc:208
+#: admin/fai/class_faiDebconfConfigurations.inc:426
+#: admin/fai/tabsProfile.inc:33 admin/fai/class_faiManagement.inc:238
+#: admin/fai/class_faiManagement.inc:614 admin/fai/class_faiManagement.inc:620
+#: admin/fai/class_faiManagement.inc:906 admin/fai/class_faiManagement.inc:950
+#: admin/fai/class_faiManagement.inc:974
+#: admin/fai/class_faiManagement.inc:1238
+#: admin/fai/class_faiScriptEntry.inc:59 admin/fai/class_faiScriptEntry.inc:62
+#: admin/fai/tabsScript.inc:33 admin/fai/tabsPackage.inc:33
+#: admin/fai/tabsPartition.inc:34 admin/fai/class_faiScript.inc:224
+#: admin/fai/tabsTemplate.inc:33 admin/fai/class_FAI.inc:548
+#: admin/fai/class_faiHook.inc:233 admin/fai/class_faiProfile.inc:263
+#: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
+#: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiPackage.inc:371
+#: admin/fai/class_faiPackage.inc:404 admin/fai/tabsVariable.inc:33
+msgid "Error"
+msgstr "Błąd"
 
-#: admin/fai/faiTemplateEntry.tpl:45
-msgid "Template attributes"
-msgstr "Atrybuty szablonu"
+#: admin/systems/services/repository/class_servRepository.inc:142
+#, fuzzy
+msgid "FAI release"
+msgstr "Klasy FAI"
 
-#: admin/fai/faiTemplateEntry.tpl:53 admin/fai/class_faiTemplateEntry.inc:211
-msgid "File"
-msgstr "Plik"
+#: admin/systems/services/repository/class_servRepository.inc:177
+#: admin/fai/class_faiSummaryTab.inc:343
+#: admin/fai/class_faiPartitionTable.inc:364
+#: admin/fai/class_faiPartitionTable.inc:536 admin/fai/faiPackage.tpl:9
+#: admin/fai/class_faiPartitionTableEntry.inc:375
+#: admin/fai/class_faiPartitionTableEntry.inc:378
+#: admin/fai/class_faiPartitionTableEntry.inc:474
+#: admin/fai/class_faiTemplate.inc:417 admin/fai/class_faiTemplate.inc:537
+#: admin/fai/faiVariable.tpl:9 admin/fai/class_askClassName.inc:142
+#: admin/fai/class_askClassName.inc:151 admin/fai/class_askClassName.inc:155
+#: admin/fai/class_faiManagement.inc:614 admin/fai/class_faiManagement.inc:620
+#: admin/fai/class_faiScriptEntry.inc:137
+#: admin/fai/class_faiScriptEntry.inc:142
+#: admin/fai/class_faiScriptEntry.inc:145
+#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/faiVariableEntry.tpl:9
+#: admin/fai/faiScript.tpl:9 admin/fai/class_faiScript.inc:322
+#: admin/fai/class_faiScript.inc:478 admin/fai/class_faiScript.inc:637
+#: admin/fai/faiScriptEntry.tpl:9 admin/fai/class_faiTemplateEntry.inc:207
+#: admin/fai/class_faiTemplateEntry.inc:273 admin/fai/faiTemplate.tpl:9
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/faiHook.tpl:9
+#: admin/fai/class_faiHook.inc:434 admin/fai/class_faiHook.inc:552
+#: admin/fai/class_faiProfile.inc:413 admin/fai/class_faiProfile.inc:423
+#: admin/fai/class_faiProfile.inc:497 admin/fai/class_faiHookEntry.inc:145
+#: admin/fai/class_faiHookEntry.inc:150 admin/fai/class_faiHookEntry.inc:153
+#: admin/fai/class_faiHookEntry.inc:196 admin/fai/class_faiVariable.inc:296
+#: admin/fai/class_faiVariable.inc:397 admin/fai/class_faiVariableEntry.inc:90
+#: admin/fai/class_faiVariableEntry.inc:99
+#: admin/fai/class_faiVariableEntry.inc:102
+#: admin/fai/class_faiVariableEntry.inc:137 admin/fai/class_faiPackage.inc:575
+#: admin/fai/class_faiPackage.inc:734 admin/fai/faiPartitionTable.tpl:9
+#: admin/fai/faiPartitionTableEntry.tpl:6 admin/fai/faiProfile.tpl:9
+msgid "Name"
+msgstr "Imię"
 
-#: admin/fai/faiTemplateEntry.tpl:60
-msgid "Save template"
-msgstr "Zapisz szablon"
+#: admin/systems/services/repository/class_servRepository.inc:352
+#: admin/fai/class_faiDebconfConfigurations.inc:71
+#: admin/fai/class_faiManagement.inc:788
+#: admin/fai/class_faiPackageConfiguration.inc:35 admin/fai/class_FAI.inc:566
+#: admin/fai/class_faiPackage.inc:273 admin/fai/class_faiPackage.inc:597
+#: admin/fai/class_faiPackageEntry.inc:53
+#: admin/fai/class_faiPackageEntry.inc:193
+#, fuzzy
+msgid "Service infrastructure"
+msgstr "Szukaj wewnątrz tego poddrzewa"
 
-#: admin/fai/faiTemplateEntry.tpl:69
-msgid "Upload"
-msgstr "Wgraj"
+#: admin/systems/services/repository/class_servRepository.inc:369
+#: admin/systems/services/repository/servRepositorySetup.tpl:1
+#: admin/fai/faiPackage.tpl:33
+msgid "Repository"
+msgstr "Repozytorium"
 
-#: admin/fai/faiTemplateEntry.tpl:76
+#: admin/systems/services/repository/class_servRepository.inc:370
+msgid "Services"
+msgstr "Usługi"
+
+#: admin/systems/services/repository/class_servRepository.inc:383
+#: admin/systems/services/repository/servRepositorySetup.tpl:8
 #, fuzzy
-msgid "Full path"
-msgstr "Ścieżka do fontów"
+msgid "Parent server"
+msgstr "Zachowaj"
 
-#: admin/fai/faiTemplateEntry.tpl:92
-msgid "Owner"
-msgstr "Właściciel"
+#: admin/systems/services/repository/class_servRepository.inc:384
+#: admin/fai/branch_selector.tpl:2
+#, fuzzy
+msgid "Releases"
+msgstr "Wersja"
 
-#: admin/fai/faiTemplateEntry.tpl:103 admin/fai/faiTemplateEntry.tpl:145
-#: admin/fai/class_faiTemplateEntry.inc:230
-#: admin/fai/class_faiTemplateEntry.inc:233
-#: admin/fai/class_faiTemplateEntry.inc:235
-msgid "Group"
-msgstr "Grupa"
+#: admin/systems/services/repository/class_servRepository.inc:385
+#: admin/systems/services/repository/class_servRepositorySetup.inc:157
+#: admin/systems/services/repository/servRepositorySetup.tpl:28
+msgid "URL"
+msgstr ""
 
-#: admin/fai/faiTemplateEntry.tpl:114
-msgid "Access"
-msgstr "Dostęp"
+#: admin/systems/services/repository/class_servRepository.inc:386
+#: admin/systems/services/repository/servRepositorySetup.tpl:39
+#: admin/systems/services/repository/class_divListRepositories.inc:24
+#: admin/systems/services/repository/class_divListRepositories.inc:64
+#, fuzzy
+msgid "Sections"
+msgstr "Sekcja"
 
-#: admin/fai/faiTemplateEntry.tpl:120
-msgid "Class"
-msgstr "Klasa"
+#: admin/systems/services/repository/class_servRepositorySetup.inc:153
+#: admin/systems/services/repository/servRepositorySetup.tpl:19
+#: admin/systems/services/repository/class_divListRepositories.inc:23
+#: admin/fai/faiPackage.tpl:37 admin/fai/branch_selector.tpl:25
+#: admin/fai/class_faiPackage.inc:740
+msgid "Release"
+msgstr "Wersja"
 
-#: admin/fai/faiTemplateEntry.tpl:121
-msgid "Read"
-msgstr "Odczyt"
+#: admin/systems/services/repository/class_divListRepositories.inc:19
+#, fuzzy
+msgid "List of configured repositories"
+msgstr "Lista użytkowników"
 
-#: admin/fai/faiTemplateEntry.tpl:122
-msgid "Write"
-msgstr "Zapis"
+#: admin/systems/services/repository/class_divListRepositories.inc:20
+#, fuzzy
+msgid "This menu allows you to create, delete and edit repository settings."
+msgstr "To menu umożliwia tworzenie, usuwanie oraz edycję klas FAI."
 
-#: admin/fai/faiTemplateEntry.tpl:123
-msgid "Execute"
-msgstr "Uruchom"
+#: admin/systems/services/repository/class_divListRepositories.inc:25
+msgid "Options"
+msgstr "Opcje"
 
-#: admin/fai/faiTemplateEntry.tpl:125
-msgid "Special"
-msgstr "Specjalne"
+#: admin/systems/services/repository/class_divListRepositories.inc:26
+#: admin/fai/faiProfileEntry.tpl:59 admin/fai/faiPackageEntry.tpl:44
+msgid "Regular expression for matching object names"
+msgstr "Wyrażenie regularne dla dopasowania nazw obiektów"
 
-#: admin/fai/faiTemplateEntry.tpl:128 admin/fai/class_faiTemplateEntry.inc:224
-#: admin/fai/class_faiTemplateEntry.inc:226
-msgid "User"
-msgstr "Użytkownik"
+#: admin/systems/services/repository/class_divListRepositories.inc:33
+#, fuzzy
+msgid "Add repository"
+msgstr "Katalog"
 
-#: admin/fai/faiTemplateEntry.tpl:142
-msgid "SUID"
-msgstr "SUID"
+#: admin/fai/faiPackageConfiguration.tpl:1
+#: admin/fai/class_faiDebconfConfigurations.inc:140
+#: admin/fai/NewDebconfConfiguration.tpl:16 admin/fai/class_divListFai.inc:68
+#: admin/fai/faiDebconfConfigurations.tpl:1 admin/fai/class_faiPackage.inc:726
+msgid "Package"
+msgstr "Pakiet"
 
-#: admin/fai/faiTemplateEntry.tpl:159
-msgid "SGID"
-msgstr "SGID"
+#: admin/fai/class_faiSummaryTab.inc:44 admin/fai/class_divListFai.inc:156
+#: admin/fai/class_divListFai.inc:212 admin/fai/class_faiGroupHandle.inc:104
+msgid "Scripts"
+msgstr "Skrypty"
 
-#: admin/fai/faiTemplateEntry.tpl:162
-msgid "Others"
-msgstr "Inne"
+#: admin/fai/class_faiSummaryTab.inc:45 admin/fai/class_divListFai.inc:158
+#: admin/fai/class_divListFai.inc:216 admin/fai/class_faiGroupHandle.inc:108
+msgid "Hooks"
+msgstr "Zaczepy"
 
-#: admin/fai/faiTemplateEntry.tpl:176
-msgid "sticky"
-msgstr "sticky"
+#: admin/fai/class_faiSummaryTab.inc:46 admin/fai/class_divListFai.inc:160
+#: admin/fai/class_divListFai.inc:214 admin/fai/class_faiGroupHandle.inc:106
+msgid "Variables"
+msgstr "Zmienie"
 
-#: admin/fai/tabsScript.inc:33 admin/fai/tabsTemplate.inc:33
-#: admin/fai/class_faiHook.inc:239 admin/fai/tabsPartition.inc:34
-#: admin/fai/class_faiProfile.inc:262 admin/fai/class_faiManagement.inc:238
-#: admin/fai/class_faiManagement.inc:607 admin/fai/class_faiManagement.inc:613
-#: admin/fai/class_faiManagement.inc:899 admin/fai/class_faiManagement.inc:943
-#: admin/fai/class_faiManagement.inc:967
-#: admin/fai/class_faiManagement.inc:1216 admin/fai/class_faiTemplate.inc:212
-#: admin/fai/tabsVariable.inc:33 admin/fai/tabsPackage.inc:33
-#: admin/fai/class_faiScript.inc:229 admin/fai/class_FAI.inc:535
-#: admin/fai/class_faiScriptEntry.inc:59 admin/fai/class_faiScriptEntry.inc:62
-#: admin/fai/tabsHook.inc:32 admin/fai/class_faiPartitionTable.inc:180
-#: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
-#: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiPackage.inc:272
-#: admin/fai/class_faiSummaryTab.inc:89 admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/class_servRepository.inc:142
-#: admin/systems/services/repository/class_servRepository.inc:177
-#: admin/systems/services/repository/class_servRepository.inc:182
-#: admin/systems/services/repository/class_servRepositorySetup.inc:204
-msgid "Error"
-msgstr "Błąd"
+#: admin/fai/class_faiSummaryTab.inc:47 admin/fai/class_divListFai.inc:220
+#: admin/fai/class_faiGroupHandle.inc:112
+msgid "Templates"
+msgstr "Szablony"
 
-#: admin/fai/tabsScript.inc:33 admin/fai/tabsTemplate.inc:33
-#: admin/fai/tabsPartition.inc:34 admin/fai/tabsVariable.inc:33
-#: admin/fai/tabsPackage.inc:33 admin/fai/tabsHook.inc:32
-#: admin/fai/tabsProfile.inc:33
-#, fuzzy
-msgid "Moving the tree failed. Destination tree is subtree of source tree."
-msgstr ""
-"Próba przeniesienia drzewa nieudana. Docelowe drzewo jest poddrzewem w "
-"drzewie źródłowym."
+#: admin/fai/class_faiSummaryTab.inc:48
+#: admin/fai/class_faiPartitionTable.inc:528
+#: admin/fai/class_askClassName.inc:79 admin/fai/class_divListFai.inc:154
+#: admin/fai/class_divListFai.inc:208 admin/fai/class_faiGroupHandle.inc:100
+#: admin/fai/class_faiProfileEntry.inc:143 admin/fai/class_faiProfile.inc:298
+msgid "Partition table"
+msgstr "Tablica partycji"
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:513
-#: admin/fai/class_faiManagement.inc:1286 admin/fai/remove_branch.tpl:2
-msgid "Warning"
-msgstr "Ostrzeżenie"
+#: admin/fai/class_faiSummaryTab.inc:49 admin/fai/class_divListFai.inc:164
+#: admin/fai/class_divListFai.inc:210 admin/fai/class_faiGroupHandle.inc:102
+msgid "Package list"
+msgstr "Lista pakietów"
 
-#: admin/fai/remove.tpl:7
-msgid ""
-"This includes 'all' object information. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
-msgstr ""
-"Operacja odnosi się do 'wszystkich' informacji obiektowych. Proszę upewnić "
-"się, czy na pewno wykonać tą operację, gdyż nie ma możliwości powrotu."
+#: admin/fai/class_faiSummaryTab.inc:50
+msgid "Profiles"
+msgstr "Profile"
 
-#: admin/fai/remove.tpl:11
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: admin/fai/class_faiSummaryTab.inc:89
+msgid "Unknown FAI information source!"
 msgstr ""
-"Przed wykonaniem tej operacji zaleca się wykonanie kopii bezpieczeństwa "
-"drzewa LDAP. Naciśnij 'Usuń' aby kontynuować, lub 'Anuluj' aby przerwać."
 
-#: admin/fai/faiGroupHandle.tpl:3
-#, fuzzy
-msgid "Please select the objects you want to remove:"
-msgstr "Proszę podać nową nazwę."
+#: admin/fai/class_faiSummaryTab.inc:220
+msgid "This object has no FAI classes assigned."
+msgstr "Ten obiekt nie ma przypisanych klas FAI."
 
-#: admin/fai/faiGroupHandle.tpl:22 admin/fai/class_divListFai.inc:145
-#, fuzzy
-msgid "Freezed"
-msgstr "Częstotliwość"
+#: admin/fai/class_faiSummaryTab.inc:233
+msgid "Open"
+msgstr "Otwórz"
 
-#: admin/fai/faiGroupHandle.tpl:30
-#, fuzzy
-msgid "Select the object you want to edit:"
-msgstr "Wybierz obiekty do dodania"
+#: admin/fai/class_faiSummaryTab.inc:239
+msgid "Close"
+msgstr "Zamknij"
 
-#: admin/fai/faiGroupHandle.tpl:53
-#, fuzzy
-msgid "Select the object you want to copy:"
-msgstr "Wybierz aby zobaczyć grupy GOsa"
+#: admin/fai/class_faiSummaryTab.inc:342
+msgid "No."
+msgstr "Nie."
 
-#: admin/fai/faiGroupHandle.tpl:76
-#, fuzzy
-msgid "Select the object you want to cut:"
-msgstr "Wybierz aby zobaczyć grupy GOsa"
+#: admin/fai/class_faiSummaryTab.inc:344
+msgid "FS options"
+msgstr "Opcje systemu plików"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:176
-msgid "primary"
-msgstr "podstawowa"
+#: admin/fai/class_faiSummaryTab.inc:345
+#: admin/fai/class_faiPartitionTableEntry.inc:187
+#: admin/fai/class_faiPartitionTableEntry.inc:481
+msgid "Mount options"
+msgstr "Opcje montowania"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:176
-msgid "logical"
-msgstr "logiczna"
+#: admin/fai/class_faiSummaryTab.inc:346
+#: admin/fai/class_faiPartitionTableEntry.inc:186
+msgid "Size in MB"
+msgstr "Rozmiar w MB"
+
+#: admin/fai/class_faiSummaryTab.inc:347
+#: admin/fai/class_faiPartitionTableEntry.inc:185
+#: admin/fai/class_faiPartitionTableEntry.inc:479
+msgid "Mount point"
+msgstr "Punkt montowania"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:183
 #: admin/fai/class_faiSummaryTab.inc:348
+#: admin/fai/class_faiPartitionTableEntry.inc:183
+#: admin/fai/class_faiDebconfConfigurations.inc:142
+#: admin/fai/NewDebconfConfiguration.tpl:22
 msgid "Type"
 msgstr "Typ"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:184
-msgid "FS type"
-msgstr "Typ FS"
+#: admin/fai/class_faiPartitionTable.inc:294
+#: admin/fai/class_faiPartitionTable.inc:300
+#, php-format
+msgid "%s partition"
+msgstr "partycja %s"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:185
-#: admin/fai/class_faiPartitionTableEntry.inc:474
-#: admin/fai/class_faiSummaryTab.inc:347
-msgid "Mount point"
-msgstr "Punkt montowania"
+#: admin/fai/class_faiPartitionTable.inc:296
+#: admin/fai/class_faiPartitionTable.inc:302
+#, php-format
+msgid "%s partition(s)"
+msgstr "partycje %s"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:186
-#: admin/fai/class_faiSummaryTab.inc:346
-msgid "Size in MB"
-msgstr "Rozmiar w MB"
+#: admin/fai/class_faiPartitionTable.inc:529
+msgid "FAI partition table"
+msgstr "Tablica partycji FAI"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:187
-#: admin/fai/class_faiPartitionTableEntry.inc:476
-#: admin/fai/class_faiSummaryTab.inc:345
-msgid "Mount options"
-msgstr "Opcje montowania"
+#: admin/fai/class_faiPartitionTable.inc:536 admin/fai/class_faiHook.inc:552
+#: admin/fai/class_faiVariable.inc:397
+#, fuzzy
+msgid "Read only"
+msgstr "Odczyt"
+
+#: admin/fai/class_faiPartitionTable.inc:537 admin/fai/faiPackage.tpl:21
+#: admin/fai/class_faiPartitionTableEntry.inc:475
+#: admin/fai/class_faiTemplate.inc:538 admin/fai/faiVariable.tpl:21
+#: admin/fai/class_faiScriptEntry.inc:190 admin/fai/faiVariableEntry.tpl:19
+#: admin/fai/faiScript.tpl:21 admin/fai/faiTemplateEntry.tpl:33
+#: admin/fai/class_faiScript.inc:638 admin/fai/faiScriptEntry.tpl:19
+#: admin/fai/class_faiTemplateEntry.inc:274 admin/fai/faiTemplate.tpl:21
+#: admin/fai/faiHookEntry.tpl:19 admin/fai/faiHook.tpl:21
+#: admin/fai/class_faiHook.inc:553 admin/fai/class_faiProfile.inc:498
+#: admin/fai/class_faiHookEntry.inc:197 admin/fai/class_faiVariable.inc:398
+#: admin/fai/class_faiVariableEntry.inc:138 admin/fai/class_faiPackage.inc:735
+#: admin/fai/faiPartitionTable.tpl:21 admin/fai/faiPartitionTableEntry.tpl:13
+#: admin/fai/faiProfile.tpl:21
+msgid "Description"
+msgstr "Opis"
+
+#: admin/fai/faiProfileEntry.tpl:6
+msgid "List of FAI objects (Fully Automatic Installation)"
+msgstr "Lista obiektów FAI (Fully Automatic Installation)"
+
+#: admin/fai/faiProfileEntry.tpl:21 admin/fai/faiPackageEntry.tpl:20
+msgid "Information"
+msgstr "Informacja"
+
+#: admin/fai/faiProfileEntry.tpl:26
+msgid ""
+"This menu allows you to select FAI class names and to add them to the "
+"currently edited profile."
+msgstr ""
+"To menu umożliwia wybór nazw klas FAI i dodawania ich do obecnie edytowanego "
+"profilu."
+
+#: admin/fai/faiProfileEntry.tpl:31 admin/fai/faiPackageEntry.tpl:30
+msgid "Filters"
+msgstr "Filtry"
+
+#: admin/fai/faiProfileEntry.tpl:39
+msgid "Show only classes with templates"
+msgstr "Pokaż tylko klasy z szablonami"
+
+#: admin/fai/faiProfileEntry.tpl:41
+msgid "Show only classes with scripts"
+msgstr "Pokaż tylko klasy ze skryptami"
+
+#: admin/fai/faiProfileEntry.tpl:43
+msgid "Show only classes with hooks"
+msgstr "Pokaż tylko klasy z zaczepami"
+
+#: admin/fai/faiProfileEntry.tpl:45
+msgid "Show only classes with variables"
+msgstr "Pokaż tylko klasy ze zmiennymi"
+
+#: admin/fai/faiProfileEntry.tpl:47
+msgid "Show only classes with packages"
+msgstr "Pokaż tylko klasy z pakietami"
+
+#: admin/fai/faiProfileEntry.tpl:49
+msgid "Show only classes with partitions"
+msgstr "Pokaż tylko klasy z partycjami"
+
+#: admin/fai/faiProfileEntry.tpl:54 admin/fai/faiProfileEntry.tpl:55
+#: admin/fai/faiPackageEntry.tpl:40
+msgid "Display objects matching"
+msgstr "Wyświetl obiekty pasujące"
+
+#: admin/fai/faiPackage.tpl:4 admin/fai/faiVariable.tpl:4
+#: admin/fai/faiVariableEntry.tpl:5 admin/fai/faiScript.tpl:4
+#: admin/fai/faiTemplateEntry.tpl:3 admin/fai/faiScriptEntry.tpl:5
+#: admin/fai/faiTemplate.tpl:4 admin/fai/faiHookEntry.tpl:5
+#: admin/fai/faiHook.tpl:4 admin/fai/faiPartitionTable.tpl:4
+#: admin/fai/faiPartitionTableEntry.tpl:2 admin/fai/faiProfile.tpl:4
+#: admin/fai/faiProfile.tpl:36
+msgid "Generic"
+msgstr "Ogólne"
+
+#: admin/fai/faiPackage.tpl:45 admin/fai/class_faiPackage.inc:737
+msgid "Section"
+msgstr "Sekcja"
+
+#: admin/fai/faiPackage.tpl:53
+msgid "Install method"
+msgstr "Metoda instalacji"
+
+#: admin/fai/faiPackage.tpl:57
+#, fuzzy
+msgid "Please select the installation method"
+msgstr "Proszę wybrać prawidłowy plik"
+
+#: admin/fai/faiPackage.tpl:71
+msgid "Used packages"
+msgstr "Użyte pakiety"
+
+#: admin/fai/faiPackage.tpl:84
+msgid "Add from list"
+msgstr ""
+
+#: admin/fai/faiPackage.tpl:91
+#, fuzzy
+msgid "Edit package configurations"
+msgstr "Konfiguracja bazy FAX"
+
+#: admin/fai/class_faiPartitionTableEntry.inc:176
+msgid "primary"
+msgstr "podstawowa"
+
+#: admin/fai/class_faiPartitionTableEntry.inc:176
+msgid "logical"
+msgstr "logiczna"
+
+#: admin/fai/class_faiPartitionTableEntry.inc:184
+msgid "FS type"
+msgstr "Typ FS"
 
 #: admin/fai/class_faiPartitionTableEntry.inc:188
 msgid "FS option"
@@ -260,52 +419,17 @@ msgstr "Tak"
 msgid "Remove"
 msgstr "Usuń"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:371
-#: admin/fai/class_faiPartitionTableEntry.inc:374
-#: admin/fai/class_faiPartitionTableEntry.inc:469 admin/fai/faiVariable.tpl:9
-#: admin/fai/class_faiHook.inc:440 admin/fai/class_faiHook.inc:561
-#: admin/fai/faiProfile.tpl:9 admin/fai/faiScriptEntry.tpl:9
-#: admin/fai/faiScript.tpl:9 admin/fai/faiPackage.tpl:9
-#: admin/fai/faiHook.tpl:9 admin/fai/class_faiProfile.inc:395
-#: admin/fai/class_faiProfile.inc:405 admin/fai/class_faiProfile.inc:478
-#: admin/fai/faiPartitionTableEntry.tpl:6 admin/fai/faiHookEntry.tpl:9
-#: admin/fai/class_faiManagement.inc:607 admin/fai/class_faiManagement.inc:613
-#: admin/fai/class_faiVariableEntry.inc:90
-#: admin/fai/class_faiVariableEntry.inc:99
-#: admin/fai/class_faiVariableEntry.inc:102
-#: admin/fai/class_faiVariableEntry.inc:137
-#: admin/fai/class_faiTemplate.inc:421 admin/fai/class_faiTemplate.inc:544
-#: admin/fai/class_askClassName.inc:142 admin/fai/class_askClassName.inc:146
-#: admin/fai/class_askClassName.inc:150 admin/fai/class_faiScript.inc:327
-#: admin/fai/class_faiScript.inc:483 admin/fai/class_faiScript.inc:645
-#: admin/fai/class_faiScriptEntry.inc:137
-#: admin/fai/class_faiScriptEntry.inc:142
-#: admin/fai/class_faiScriptEntry.inc:145
-#: admin/fai/class_faiScriptEntry.inc:189 admin/fai/faiTemplate.tpl:9
-#: admin/fai/class_faiPartitionTable.inc:371
-#: admin/fai/class_faiPartitionTable.inc:549 admin/fai/faiVariableEntry.tpl:9
-#: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
-#: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
-#: admin/fai/class_faiVariable.inc:296 admin/fai/class_faiVariable.inc:397
-#: admin/fai/class_faiPackage.inc:456 admin/fai/class_faiPackage.inc:581
-#: admin/fai/class_faiTemplateEntry.inc:207
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiSummaryTab.inc:343 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/class_servRepository.inc:177
-msgid "Name"
-msgstr "Imię"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:397
+#: admin/fai/class_faiPartitionTableEntry.inc:402
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr "proszę podać unikalny punkt montowania dla partycji %s"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:402
+#: admin/fai/class_faiPartitionTableEntry.inc:407
 #, php-format
 msgid "partition %s mount point"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:407
+#: admin/fai/class_faiPartitionTableEntry.inc:412
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
@@ -314,22 +438,22 @@ msgstr ""
 "Typ systemu plików 'swap' jest już użyty. Zmień system plików dla partycji %"
 "s."
 
-#: admin/fai/class_faiPartitionTableEntry.inc:411
+#: admin/fai/class_faiPartitionTableEntry.inc:416
 msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr ""
 "Proszę użyć 'swap' jako punkt montowania w przypadku użycia systemu plików "
 "'swap'."
 
-#: admin/fai/class_faiPartitionTableEntry.inc:417
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#: admin/fai/class_faiPartitionTableEntry.inc:427
-#: admin/fai/class_faiPartitionTableEntry.inc:429
+#: admin/fai/class_faiPartitionTableEntry.inc:422
+#: admin/fai/class_faiPartitionTableEntry.inc:426
+#: admin/fai/class_faiPartitionTableEntry.inc:432
 #: admin/fai/class_faiPartitionTableEntry.inc:434
+#: admin/fai/class_faiPartitionTableEntry.inc:439
 #, fuzzy, php-format
 msgid "partition %s size"
 msgstr "Rozmiar partycji"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiPartitionTableEntry.inc:454
 msgid ""
 "You have more than 3 primary partition table entries in your configuration, "
 "please check your configuration twice."
@@ -337,255 +461,299 @@ msgstr ""
 "Jest więcej niż 3 wpisy w podstawowej tablicy partycji. Proszę sprawdzić "
 "konfigurację."
 
-#: admin/fai/class_faiPartitionTableEntry.inc:461
+#: admin/fai/class_faiPartitionTableEntry.inc:466
 #, fuzzy
 msgid "Partition table entry"
 msgstr "Tablica partycji"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:462
+#: admin/fai/class_faiPartitionTableEntry.inc:467
 #, fuzzy
 msgid "FAI partition table entry"
 msgstr "Tablica partycji FAI"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:471
+#: admin/fai/class_faiPartitionTableEntry.inc:476
 msgid "Partition type"
 msgstr "Typ partycji"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:472
+#: admin/fai/class_faiPartitionTableEntry.inc:477
 msgid "Partition no."
 msgstr "Nr. Partycji"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:473
+#: admin/fai/class_faiPartitionTableEntry.inc:478
 msgid "File system type"
 msgstr "Typ systemu plików"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:475
+#: admin/fai/class_faiPartitionTableEntry.inc:480
 msgid "Partition size"
 msgstr "Rozmiar partycji"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:477
+#: admin/fai/class_faiPartitionTableEntry.inc:482
 msgid "File system options"
 msgstr "Opcje systemu plików"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:478
+#: admin/fai/class_faiPartitionTableEntry.inc:483
 msgid "Partition flags"
 msgstr "Flagi partycji"
 
-#: admin/fai/faiVariable.tpl:36 admin/fai/faiScript.tpl:38
-#: admin/fai/faiHook.tpl:38 admin/fai/class_faiProfileEntry.inc:175
-#: admin/fai/faiTemplate.tpl:33 admin/fai/faiPartitionTable.tpl:36
-msgid "Objects"
-msgstr "Obiekty"
+#: admin/fai/remove_branch.tpl:2 admin/fai/class_faiManagement.inc:520
+#: admin/fai/class_faiManagement.inc:1308 admin/fai/remove.tpl:2
+msgid "Warning"
+msgstr "Ostrzeżenie"
 
-#: admin/fai/faiVariable.tpl:38
-msgid "List of assigned variables"
-msgstr "Lista przypisanych zmiennych"
+#: admin/fai/remove_branch.tpl:6
+msgid ""
+"This includes all account data, system access, etc. for this branch. Please "
+"double check if your really want to do this since there is no way for GOsa "
+"to get your data back."
+msgstr ""
+"Operacja odnosi się do wszystkich danych kont, dostępów, etc dla tej gałęzi. "
+"Proszę upewnić się czy na pewno wykonać operację, gdyż nie ma możliwości "
+"powrotu."
 
-#: admin/fai/faiVariable.tpl:44
-msgid "Choose a variable to delete or edit"
-msgstr "Wybierz zmienną do usunięcia lub edycji"
+#: admin/fai/remove_branch.tpl:10
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
+"anulować."
 
-#: admin/fai/faiVariable.tpl:53 admin/fai/class_faiHook.inc:312
-#: admin/fai/class_faiHook.inc:314 admin/fai/faiPartitionTable.tpl:54
-msgid "Edit"
-msgstr "Edytuj"
+#: admin/fai/tabsHook.inc:32 admin/fai/tabsProfile.inc:33
+#: admin/fai/tabsScript.inc:33 admin/fai/tabsPackage.inc:33
+#: admin/fai/tabsPartition.inc:34 admin/fai/tabsTemplate.inc:33
+#: admin/fai/tabsVariable.inc:33
+#, fuzzy
+msgid "Moving the tree failed. Destination tree is subtree of source tree."
+msgstr ""
+"Próba przeniesienia drzewa nieudana. Docelowe drzewo jest poddrzewem w "
+"drzewie źródłowym."
 
-#: admin/fai/class_faiHook.inc:316
-msgid "Delete"
+#: admin/fai/class_faiTemplate.inc:282 admin/fai/class_faiTemplate.inc:284
+#: admin/fai/class_faiScript.inc:339 admin/fai/class_faiScript.inc:341
+msgid "edit"
+msgstr "edytuj"
+
+#: admin/fai/class_faiTemplate.inc:286 admin/fai/class_faiScript.inc:343
+msgid "delete"
 msgstr "Usuń"
 
-#: admin/fai/class_faiHook.inc:326 admin/fai/class_faiTemplate.inc:300
-#: admin/fai/class_faiScript.inc:330 admin/fai/class_faiScript.inc:358
-#: admin/fai/class_faiScriptEntry.inc:88 admin/fai/class_faiHookEntry.inc:80
+#: admin/fai/class_faiTemplate.inc:296 admin/fai/class_faiScriptEntry.inc:88
+#: admin/fai/class_faiScript.inc:325 admin/fai/class_faiScript.inc:353
+#: admin/fai/class_faiHook.inc:320 admin/fai/class_faiHookEntry.inc:80
 msgid "Download"
 msgstr "Ściągnij"
 
-#: admin/fai/class_faiHook.inc:553 admin/fai/class_divListFai.inc:64
-msgid "Hook"
-msgstr "Zaczep"
+#: admin/fai/class_faiTemplate.inc:529
+msgid "Template"
+msgstr "Szablon"
 
-#: admin/fai/class_faiHook.inc:554
-msgid "FAI hook"
-msgstr "Zaczep FAI"
+#: admin/fai/class_faiTemplate.inc:530
+msgid "FAI template"
+msgstr "Szablon FAI"
 
-#: admin/fai/class_faiHook.inc:561 admin/fai/class_faiPartitionTable.inc:549
-#: admin/fai/class_faiVariable.inc:397
+#: admin/fai/class_faiTemplate.inc:537 admin/fai/class_faiScript.inc:637
+#: admin/fai/class_faiPackage.inc:737 admin/fai/class_faiPackage.inc:740
 #, fuzzy
-msgid "Read only"
+msgid "Readonly"
 msgstr "Odczyt"
 
-#: admin/fai/faiProfile.tpl:36 admin/fai/class_faiProfile.inc:480
-msgid "FAI classes"
-msgstr "Klasy FAI"
+#: admin/fai/faiNewBranch.tpl:5
+msgid ""
+"You are now going to create a branch or locked branch. This action clones "
+"the existing release to another release name. Branches can be modified as "
+"usual. FAI classes of locked branches cannot be modified, just additional "
+"classes are possible. Branch names should be alphanumeric, excluding the "
+"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
+"and 'fai'."
+msgstr ""
+"Zamierzasz utworzyć gałąź lub zablokowaną gałąź. Ta akcja klonuje istniejące "
+"wydanie do innej nazwy wydania. Gałęzie mogą być zwyczajnie modyfikowane. "
+"Klasy FAI zablokowanych gałęzi nie mogą być modyfikowane, można tylko "
+"dodawać klasy. Nazwy gałęzi powinny składać się ze znaków alfanumerycznych i "
+"nie zawierać zarezerwowanych nazw 'scripts', 'hooks', 'partitions', "
+"'variables', 'templates', oraz 'fai'."
 
-#: admin/fai/faiProfile.tpl:37
-msgid "Choose a priority"
-msgstr "Wybierz priorytet"
+#: admin/fai/faiNewBranch.tpl:7
+msgid ""
+"Branches are created as subreleases of the currently selected branch. "
+"Creating a new branch named 1.0.2 in SARGE for example, will result in a new "
+"release called SARGE/1.0.2."
+msgstr ""
 
-#: admin/fai/faiScriptEntry.tpl:33
-msgid "Properties"
-msgstr "Właściwości"
+#: admin/fai/faiNewBranch.tpl:13
+msgid "Please enter a name for the branch"
+msgstr "Proszę podać nazwę gałęzi"
 
-#: admin/fai/faiScriptEntry.tpl:33 admin/fai/faiScriptEntry.tpl:54
-msgid "Script attributes"
-msgstr "Atrybuty skryptu"
+#: admin/fai/faiNewBranch.tpl:34
+msgid "Processing the requested operation"
+msgstr "Przetwarzam zadaną operację"
 
-#: admin/fai/faiScriptEntry.tpl:38 admin/fai/class_faiScript.inc:328
-msgid "Priority"
-msgstr "Priorytet"
+#: admin/fai/faiNewBranch.tpl:35
+msgid ""
+"As soon as the copy operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the fai management "
+"dialog."
+msgstr ""
+"Jak tylko operacja kopiowania zakończy się, można przewinąć stronę na dół i "
+"nacisnąć przycisk 'Kontynuuj' aby przejść do dialogu zarządzania FAI."
 
-#: admin/fai/faiScriptEntry.tpl:43
+#: admin/fai/faiNewBranch.tpl:41
 msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
 msgstr ""
+"Twoja przeglądarka nie obsługuje iframes, proszę użyć tego linku aby wykonać "
+"żądaną operację."
 
-#: admin/fai/faiScriptEntry.tpl:56 admin/fai/faiHookEntry.tpl:56
-#: admin/fai/class_faiScript.inc:637 admin/fai/class_faiScriptEntry.inc:150
-#: admin/fai/class_faiHookEntry.inc:158 admin/fai/class_divListFai.inc:62
-msgid "Script"
-msgstr "Skrypt"
+#: admin/fai/faiNewBranch.tpl:43
+msgid "Perform requested operation."
+msgstr "Wykonaj żądaną operację."
 
-#: admin/fai/faiScriptEntry.tpl:75 admin/fai/faiHookEntry.tpl:75
-msgid "Import script"
-msgstr "Importuj skrypt"
+#: admin/fai/faiNewBranch.tpl:43
+msgid "Initiate operation"
+msgstr "Zainicjiuj operację"
 
-#: admin/fai/faiScript.tpl:39
-msgid "List of scripts"
-msgstr "Lista skryptów"
+#: admin/fai/faiVariable.tpl:36 admin/fai/faiScript.tpl:38
+#: admin/fai/faiTemplate.tpl:33 admin/fai/faiHook.tpl:38
+#: admin/fai/class_faiProfileEntry.inc:175 admin/fai/faiPartitionTable.tpl:36
+msgid "Objects"
+msgstr "Obiekty"
 
-#: admin/fai/faiPackage.tpl:33
-#: admin/systems/services/repository/servRepositorySetup.tpl:1
-#: admin/systems/services/repository/class_servRepository.inc:343
-msgid "Repository"
-msgstr "Repozytorium"
+#: admin/fai/faiVariable.tpl:38
+msgid "List of assigned variables"
+msgstr "Lista przypisanych zmiennych"
 
-#: admin/fai/faiPackage.tpl:37 admin/fai/branch_selector.tpl:25
-#: admin/fai/class_faiPackage.inc:587
-#: admin/systems/services/repository/class_divListRepositories.inc:23
-#: admin/systems/services/repository/servRepositorySetup.tpl:19
-#: admin/systems/services/repository/class_servRepositorySetup.inc:153
-msgid "Release"
-msgstr "Wersja"
+#: admin/fai/faiVariable.tpl:44
+msgid "Choose a variable to delete or edit"
+msgstr "Wybierz zmienną do usunięcia lub edycji"
 
-#: admin/fai/faiPackage.tpl:45 admin/fai/class_faiPackage.inc:584
-msgid "Section"
-msgstr "Sekcja"
+#: admin/fai/faiVariable.tpl:53
+#: admin/fai/class_faiDebconfConfigurations.inc:152
+#: admin/fai/class_faiHook.inc:306 admin/fai/class_faiHook.inc:308
+#: admin/fai/faiPartitionTable.tpl:54
+msgid "Edit"
+msgstr "Edytuj"
 
-#: admin/fai/faiPackage.tpl:53
-msgid "Install method"
-msgstr "Metoda instalacji"
+#: admin/fai/class_faiDebconfConfigurations.inc:107
+#, fuzzy
+msgid "Currently saved"
+msgstr "Ustaw status"
 
-#: admin/fai/faiPackage.tpl:57
+#: admin/fai/class_faiDebconfConfigurations.inc:110
+#: admin/fai/class_faiDebconfConfigurations.inc:115
 #, fuzzy
-msgid "Please select the installation method"
-msgstr "Proszę wybrać prawidłowy plik"
+msgid "Currently not saved"
+msgstr "Obecny obiekt"
 
-#: admin/fai/faiPackage.tpl:71
-msgid "Used packages"
-msgstr "Użyte pakiety"
+#: admin/fai/class_faiDebconfConfigurations.inc:141
+#: admin/fai/NewDebconfConfiguration.tpl:19 admin/fai/class_divListFai.inc:60
+#: admin/fai/class_divListFai.inc:66 admin/fai/class_faiVariable.inc:389
+msgid "Variable"
+msgstr "Zmienna"
 
-#: admin/fai/faiHook.tpl:39
-msgid "List of hook scripts"
-msgstr "Lista zaczepionych slryptów"
+#: admin/fai/class_faiDebconfConfigurations.inc:143
+#: admin/fai/NewDebconfConfiguration.tpl:25
+#: admin/fai/NewDebconfConfiguration.tpl:43
+#, fuzzy
+msgid "Value"
+msgstr "Zmienna"
 
-#: admin/fai/class_faiProfile.inc:289 admin/fai/class_faiProfileEntry.inc:172
-msgid "This list displays all assigned class names for this profile."
-msgstr "Ta lista wyświetla wszystkie przypisane nazwy klas dla tego profilu."
+#: admin/fai/class_faiDebconfConfigurations.inc:148
+#, fuzzy
+msgid "Reset"
+msgstr "Usuń"
 
-#: admin/fai/class_faiProfile.inc:292 admin/fai/class_askClassName.inc:83
-#: admin/fai/class_faiProfileEntry.inc:138
-msgid "Hook bundle"
-msgstr "Zestaw zaczepów"
+#: admin/fai/class_faiDebconfConfigurations.inc:150
+#: admin/fai/class_faiHook.inc:310
+msgid "Delete"
+msgstr "Usuń"
 
-#: admin/fai/class_faiProfile.inc:293 admin/fai/class_askClassName.inc:85
-#: admin/fai/class_faiProfileEntry.inc:139
-msgid "Template bundle"
-msgstr "Zestaw szablonów"
+#: admin/fai/class_faiDebconfConfigurations.inc:281
+#, fuzzy, php-format
+msgid "Debconf information for package list '%s'"
+msgstr "Informacja Debconf dla pakietu '%s'"
 
-#: admin/fai/class_faiProfile.inc:294 admin/fai/class_askClassName.inc:81
-#: admin/fai/class_faiProfileEntry.inc:140
-msgid "Script bundle"
-msgstr "Zestaw skryptów"
+#: admin/fai/class_faiDebconfConfigurations.inc:491
+#, php-format
+msgid ""
+"The specified value '%s' for variable '%s' is not valid with the specified "
+"boolean variable type.<br><i>Allowed values: true, false, 1, 0.</i>"
+msgstr ""
 
-#: admin/fai/class_faiProfile.inc:295 admin/fai/class_askClassName.inc:82
-#: admin/fai/class_faiProfileEntry.inc:141
-msgid "Variable bundle"
-msgstr "Zestaw zmiennych"
+#: admin/fai/class_askClassName.inc:79 admin/fai/class_askClassName.inc:80
+#: admin/fai/class_askClassName.inc:81 admin/fai/class_askClassName.inc:82
+#: admin/fai/class_askClassName.inc:83 admin/fai/class_askClassName.inc:84
+#: admin/fai/class_askClassName.inc:85 admin/fai/class_askClassName.inc:86
+msgid "Create new FAI object"
+msgstr "Utwórz nowy obiekt FAI"
 
-#: admin/fai/class_faiProfile.inc:296 admin/fai/class_askClassName.inc:80
-#: admin/fai/class_faiProfileEntry.inc:142
+#: admin/fai/class_askClassName.inc:80 admin/fai/class_faiProfileEntry.inc:142
+#: admin/fai/class_faiProfile.inc:297
 msgid "Package bundle"
 msgstr "Zestaw pakietu"
 
-#: admin/fai/class_faiProfile.inc:297 admin/fai/class_askClassName.inc:79
-#: admin/fai/class_faiGroupHandle.inc:100
-#: admin/fai/class_faiProfileEntry.inc:143
-#: admin/fai/class_faiPartitionTable.inc:541
-#: admin/fai/class_divListFai.inc:154 admin/fai/class_divListFai.inc:208
-#: admin/fai/class_faiSummaryTab.inc:48
-msgid "Partition table"
-msgstr "Tablica partycji"
-
-#: admin/fai/class_faiProfile.inc:300
-msgid "Remove class from profile"
-msgstr "Usuń klasę z profilu"
-
-#: admin/fai/class_faiProfile.inc:303
-msgid "Up"
-msgstr "Góra"
+#: admin/fai/class_askClassName.inc:81 admin/fai/class_faiProfileEntry.inc:140
+#: admin/fai/class_faiProfile.inc:295
+msgid "Script bundle"
+msgstr "Zestaw skryptów"
 
-#: admin/fai/class_faiProfile.inc:304
-msgid "Down"
-msgstr "W dół"
+#: admin/fai/class_askClassName.inc:82 admin/fai/class_faiProfileEntry.inc:141
+#: admin/fai/class_faiProfile.inc:296
+msgid "Variable bundle"
+msgstr "Zestaw zmiennych"
 
-#: admin/fai/class_faiProfile.inc:391
-msgid "No class specified for this profile!"
-msgstr ""
+#: admin/fai/class_askClassName.inc:83 admin/fai/class_faiProfileEntry.inc:138
+#: admin/fai/class_faiProfile.inc:293
+msgid "Hook bundle"
+msgstr "Zestaw zaczepów"
 
-#: admin/fai/class_faiProfile.inc:470 admin/fai/class_askClassName.inc:84
-#: admin/fai/class_faiGroupHandle.inc:110 admin/fai/class_divListFai.inc:58
+#: admin/fai/class_askClassName.inc:84 admin/fai/class_divListFai.inc:58
 #: admin/fai/class_divListFai.inc:149 admin/fai/class_divListFai.inc:218
+#: admin/fai/class_faiGroupHandle.inc:110 admin/fai/class_faiProfile.inc:489
 msgid "Profile"
 msgstr "Profile"
 
-#: admin/fai/class_faiProfile.inc:471
-msgid "FAI profile"
-msgstr "Profil FAI"
+#: admin/fai/class_askClassName.inc:85 admin/fai/class_faiProfileEntry.inc:139
+#: admin/fai/class_faiProfile.inc:294
+msgid "Template bundle"
+msgstr "Zestaw szablonów"
 
-#: admin/fai/faiPartitionTableEntry.tpl:2
-msgid "Device"
-msgstr "Urządzenie"
+#: admin/fai/class_askClassName.inc:146
+#, fuzzy, php-format
+msgid ""
+"The specified classname '%s' is invalid. Scripts must not start with a dash."
+msgstr "Podana nazwa klasy jest już używana dla tego typu obiektu."
 
-#: admin/fai/faiPartitionTableEntry.tpl:24
-msgid "Partition entries"
-msgstr "Partycje"
+#: admin/fai/class_askClassName.inc:189
+#, fuzzy, php-format
+msgid "This FAI class name is already in use by the administrative unit '%s'."
+msgstr "Podana nazwa klasy jest już używana dla tego typu obiektu."
 
-#: admin/fai/faiPartitionTableEntry.tpl:29
-#: admin/fai/faiPartitionTableEntry.tpl:31
-msgid "Add partition"
-msgstr "Dodaj partycje"
+#: admin/fai/branch_selector.tpl:8
+msgid "Current release"
+msgstr "Obecne wydanie"
 
-#: admin/fai/faiHookEntry.tpl:33 admin/fai/faiHookEntry.tpl:54
-msgid "Hook attributes"
-msgstr "Atrybuty zaczepu"
+#: admin/fai/branch_selector.tpl:20 admin/fai/branch_selector.tpl:26
+#, fuzzy
+msgid "Create release"
+msgstr "Obecne wydanie"
 
-#: admin/fai/faiHookEntry.tpl:38 admin/fai/class_faiHookEntry.inc:198
-msgid "Task"
-msgstr "Zadanie"
+#: admin/fai/branch_selector.tpl:23 admin/fai/branch_selector.tpl:29
+#, fuzzy
+msgid "Create read-only release"
+msgstr "Obecne wydanie"
 
-#: admin/fai/faiHookEntry.tpl:41
-msgid "Choose an existing FAI task"
-msgstr "Proszę wybrać istniejące zadanie FAI"
+#: admin/fai/branch_selector.tpl:28
+#, fuzzy
+msgid "Freeze"
+msgstr "Częstotliwość"
+
+#: admin/fai/branch_selector.tpl:35
+msgid "Delete current release"
+msgstr "Usuń bieżące wydanie"
 
 #: admin/fai/faiPackageEntry.tpl:6
 msgid "List of available packages"
 msgstr "Lista dostępnych pakietów"
 
-#: admin/fai/faiPackageEntry.tpl:20 admin/fai/faiProfileEntry.tpl:21
-msgid "Information"
-msgstr "Informacja"
-
 #: admin/fai/faiPackageEntry.tpl:24
 msgid ""
 "This menu allows you to select multiple packages to add them to the "
@@ -594,19 +762,37 @@ msgstr ""
 "To menu umożliwia wybieranie wielu pakietów i dodawanie ich do obecnie "
 "edytowanej listy pakietów."
 
-#: admin/fai/faiPackageEntry.tpl:30 admin/fai/faiProfileEntry.tpl:31
-msgid "Filters"
-msgstr "Filtry"
+#: admin/fai/NewDebconfConfiguration.tpl:2
+#, fuzzy
+msgid "New debconf configuration"
+msgstr "Konfiguracja pobierania"
 
-#: admin/fai/faiPackageEntry.tpl:40 admin/fai/faiProfileEntry.tpl:54
-#: admin/fai/faiProfileEntry.tpl:55
-msgid "Display objects matching"
-msgstr "Wyświetl obiekty pasujące"
+#: admin/fai/NewDebconfConfiguration.tpl:6
+msgid "In this dialog you can add a new debconf configuration."
+msgstr ""
 
-#: admin/fai/faiPackageEntry.tpl:44 admin/fai/faiProfileEntry.tpl:59
-#: admin/systems/services/repository/class_divListRepositories.inc:26
-msgid "Regular expression for matching object names"
-msgstr "Wyrażenie regularne dla dopasowania nazw obiektów"
+#: admin/fai/NewDebconfConfiguration.tpl:30
+#, fuzzy
+msgid "Select package"
+msgstr "Wybierz bazę"
+
+#: admin/fai/NewDebconfConfiguration.tpl:38
+#, fuzzy
+msgid "Select type"
+msgstr "Wybierz typ ACL"
+
+#: admin/fai/faiSummary.tpl:4
+msgid "FAI object tree"
+msgstr "Drzewo obiektów FAI"
+
+#: admin/fai/faiSummary.tpl:11
+msgid "Reload class and release configuration from parent object."
+msgstr "Przeładuj klasę i uwolnij konfigurację z obiektu nadrzędnego."
+
+#: admin/fai/faiSummary.tpl:22
+#, fuzzy
+msgid "You are not allowed to view the fai summary."
+msgstr "Brak uprawnień do usunięcia tego użytkownika!"
 
 #: admin/fai/class_faiManagement.inc:25 admin/fai/main.inc:53
 #: admin/fai/main.inc:55
@@ -617,872 +803,794 @@ msgstr ""
 msgid "Manage software packages and deployment reciepes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:338 admin/fai/class_faiManagement.inc:495
-#: admin/fai/class_faiManagement.inc:642 admin/fai/class_faiManagement.inc:804
-#: admin/fai/class_faiManagement.inc:825 admin/fai/class_faiManagement.inc:869
-#: admin/fai/class_faiManagement.inc:886
+#: admin/fai/class_faiManagement.inc:343 admin/fai/class_faiManagement.inc:502
+#: admin/fai/class_faiManagement.inc:649 admin/fai/class_faiManagement.inc:811
+#: admin/fai/class_faiManagement.inc:832 admin/fai/class_faiManagement.inc:876
+#: admin/fai/class_faiManagement.inc:893
 #, fuzzy
 msgid "Permission error"
 msgstr "Uprawnienia"
 
-#: admin/fai/class_faiManagement.inc:384
+#: admin/fai/class_faiManagement.inc:391
 #, fuzzy
 msgid "Branch locked"
 msgstr "Gałęzie"
 
-#: admin/fai/class_faiManagement.inc:384
+#: admin/fai/class_faiManagement.inc:391
 #, php-format
 msgid "The following entries are locked, you can't remove them %s."
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:400
+#: admin/fai/class_faiManagement.inc:407
 #, fuzzy
 msgid "FAI object"
 msgstr "Drzewo obiektów FAI"
 
-#: admin/fai/class_faiManagement.inc:492
+#: admin/fai/class_faiManagement.inc:499
 msgid "FAI branch/freeze"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:495
+#: admin/fai/class_faiManagement.inc:502
 #, fuzzy
 msgid "You have no permission to delete this release!"
 msgstr "Brak uprawnień do usunięcia tego wydania!"
 
-#: admin/fai/class_faiManagement.inc:513
+#: admin/fai/class_faiManagement.inc:520
 msgid "Release remove aborted because the release name check failed!"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:642 admin/fai/class_faiManagement.inc:804
-#: admin/fai/class_faiManagement.inc:825
+#: admin/fai/class_faiManagement.inc:649 admin/fai/class_faiManagement.inc:811
+#: admin/fai/class_faiManagement.inc:832
 #, fuzzy
 msgid "Branch"
 msgstr "Gałęzie"
 
-#: admin/fai/class_faiManagement.inc:750
-#: admin/fai/class_faiManagement.inc:1025
-#: admin/fai/class_faiManagement.inc:1031
+#: admin/fai/class_faiManagement.inc:757
+#: admin/fai/class_faiManagement.inc:1047
+#: admin/fai/class_faiManagement.inc:1053
 msgid "Continue"
 msgstr "Kontynuuj"
 
-#: admin/fai/class_faiManagement.inc:781
-#: admin/fai/class_faiPackageEntry.inc:53
-#: admin/fai/class_faiPackageEntry.inc:193 admin/fai/class_FAI.inc:553
-#: admin/fai/class_faiPackageConfiguration.inc:35
-#: admin/fai/class_faiPackage.inc:478
-#: admin/systems/services/repository/class_servRepository.inc:326
-#, fuzzy
-msgid "Service infrastructure"
-msgstr "Szukaj wewnątrz tego poddrzewa"
-
-#: admin/fai/class_faiManagement.inc:786 admin/fai/class_FAI.inc:1157
+#: admin/fai/class_faiManagement.inc:793 admin/fai/class_FAI.inc:1185
 #, fuzzy
 msgid "Fatal error"
 msgstr "Terminal Server"
 
-#: admin/fai/class_faiManagement.inc:846
+#: admin/fai/class_faiManagement.inc:853
 #, fuzzy
 msgid "partition table"
 msgstr "Tablica partycji"
 
-#: admin/fai/class_faiManagement.inc:847
+#: admin/fai/class_faiManagement.inc:854
 #, fuzzy
 msgid "script"
 msgstr "Skrypt"
 
-#: admin/fai/class_faiManagement.inc:848
+#: admin/fai/class_faiManagement.inc:855
 #, fuzzy
 msgid "hook"
 msgstr "Zaczep"
 
-#: admin/fai/class_faiManagement.inc:849
+#: admin/fai/class_faiManagement.inc:856
 #, fuzzy
 msgid "variable"
 msgstr "Zmienna"
 
-#: admin/fai/class_faiManagement.inc:850
+#: admin/fai/class_faiManagement.inc:857
 #, fuzzy
 msgid "template"
 msgstr "Szablon"
 
-#: admin/fai/class_faiManagement.inc:851
+#: admin/fai/class_faiManagement.inc:858
 #, fuzzy
 msgid "package list"
 msgstr "Lista pakietów"
 
-#: admin/fai/class_faiManagement.inc:869 admin/fai/class_faiManagement.inc:886
+#: admin/fai/class_faiManagement.inc:876 admin/fai/class_faiManagement.inc:893
 #, fuzzy, php-format
 msgid "You have no permission to create a new %s!"
 msgstr "Brak uprawnień do usunięcia grupy obiektowej."
 
-#: admin/fai/class_faiManagement.inc:886
+#: admin/fai/class_faiManagement.inc:893
 #, fuzzy
 msgid "profile"
 msgstr "Profile"
 
-#: admin/fai/class_faiManagement.inc:1286
+#: admin/fai/class_faiManagement.inc:1308
 msgid ""
 "The selected release is not available anymore. All triggered actions are "
 "skipped."
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1411
+#: admin/fai/class_faiManagement.inc:1433
 #, fuzzy
 msgid "FAI releases"
 msgstr "Klasy FAI"
 
-#: admin/fai/class_faiManagement.inc:1412
+#: admin/fai/class_faiManagement.inc:1434
 #, fuzzy
 msgid "FAI release management"
 msgstr "Zarządzanie FAI"
 
-#: admin/fai/class_faiManagement.inc:1417
+#: admin/fai/class_faiManagement.inc:1439
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiVariableEntry.inc:94
+#: admin/fai/class_faiScriptEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #, fuzzy
-msgid "Content"
-msgstr "Kontynuuj"
+msgid "file is empty"
+msgstr "Wybrany plik jest pusty"
 
-#: admin/fai/class_faiVariableEntry.inc:129
-#, fuzzy
-msgid "Variable entry"
-msgstr "Zawartość zmiennych"
+#: admin/fai/class_faiScriptEntry.inc:150 admin/fai/class_divListFai.inc:62
+#: admin/fai/class_faiScript.inc:629 admin/fai/faiScriptEntry.tpl:56
+#: admin/fai/faiHookEntry.tpl:56 admin/fai/class_faiHookEntry.inc:158
+msgid "Script"
+msgstr "Skrypt"
 
-#: admin/fai/class_faiVariableEntry.inc:130
+#: admin/fai/class_faiScriptEntry.inc:181
+#: admin/fai/class_faiScriptEntry.inc:191
 #, fuzzy
-msgid "FAI variable entry "
-msgstr "Zmienna FAI"
-
-#: admin/fai/class_faiVariableEntry.inc:139 admin/fai/faiVariableEntry.tpl:38
-msgid "Variable content"
-msgstr "Zawartość zmiennych"
-
-#: admin/fai/class_faiTemplate.inc:286 admin/fai/class_faiTemplate.inc:288
-#: admin/fai/class_faiScript.inc:344 admin/fai/class_faiScript.inc:346
-msgid "edit"
-msgstr "edytuj"
+msgid "Script entry"
+msgstr "Zawartość skryptu"
 
-#: admin/fai/class_faiTemplate.inc:290 admin/fai/class_faiScript.inc:348
-msgid "delete"
-msgstr "Usuń"
+#: admin/fai/class_faiScriptEntry.inc:182
+#, fuzzy
+msgid "FAI script entry"
+msgstr "Skrypt FAI"
 
-#: admin/fai/class_faiTemplate.inc:536
-msgid "Template"
-msgstr "Szablon"
+#: admin/fai/class_faiScriptEntry.inc:192
+#, fuzzy
+msgid "Script Priority"
+msgstr "Priorytet skryptu"
 
-#: admin/fai/class_faiTemplate.inc:537
-msgid "FAI template"
-msgstr "Szablon FAI"
+#: admin/fai/faiVariableEntry.tpl:33
+msgid "Variable attributes"
+msgstr "Atrybuty zmiennych"
 
-#: admin/fai/class_faiTemplate.inc:544 admin/fai/class_faiScript.inc:645
-#: admin/fai/class_faiPackage.inc:584 admin/fai/class_faiPackage.inc:587
-#, fuzzy
-msgid "Readonly"
-msgstr "Odczyt"
+#: admin/fai/faiVariableEntry.tpl:38 admin/fai/class_faiVariableEntry.inc:139
+msgid "Variable content"
+msgstr "Zawartość zmiennych"
 
-#: admin/fai/class_faiPackageEntry.inc:38
-msgid "Please enter your search string here"
-msgstr "Proszę podać szukany ciąg znaków"
+#: admin/fai/askClassName.tpl:6
+msgid ""
+"Adding a new class to the FAI management, requires a class name. You have to "
+"specify a unique class name for unique types of FAI classes, while you can "
+"use the same class name for different types of FAI classes. In the laste "
+"case, FAI will automatically enclose all these different class types to one "
+"unique class name."
+msgstr ""
+"Dodawanie nowej klasy do zarządzania FAI wymaga nazwy klasy. Należy podać "
+"unikalną nazwę klasy dla unikalnych typów klas FAI, podczas gdy można użyć "
+"tej samej nazwy klasy dla różnych typów klas FAI. W ostatnim przypadku, FAI "
+"automatycznie połączy wszystkie różne typy klas w jedną unikalną nazwę klasy."
 
-#: admin/fai/class_faiPackageEntry.inc:103
+#: admin/fai/askClassName.tpl:12
 msgid ""
-"This list displays all assigned package names for this repository settings."
+"Please use one of the following methods to choose the name for the new FAI "
+"class."
 msgstr ""
-"Ta lista wyświetla wszystkie przypisane nazwy pakietó dla tych ustawień "
-"repozytorium."
+"Proszę użyć jedną z poniższych metod dla wybrania nazwy nowej klasy FAI."
 
-#: admin/fai/paste_generic.tpl:1
-#, fuzzy
-msgid "FAI settings"
-msgstr "Klasy FAI"
+#: admin/fai/askClassName.tpl:26
+msgid "Enter FAI class name manually"
+msgstr "Podaj nazwę klasy FAI ręcznie"
 
-#: admin/fai/paste_generic.tpl:5 admin/fai/class_faiProfileEntry.inc:174
 #: admin/fai/askClassName.tpl:32 admin/fai/askClassName.tpl:54
-#: admin/fai/class_divListFai.inc:53
+#: admin/fai/class_divListFai.inc:53 admin/fai/paste_generic.tpl:5
+#: admin/fai/class_faiProfileEntry.inc:174
 msgid "Class name"
 msgstr "Nazwa klasy"
 
-#: admin/fai/remove_branch.tpl:6
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for GOsa "
-"to get your data back."
-msgstr ""
-"Operacja odnosi się do wszystkich danych kont, dostępów, etc dla tej gałęzi. "
-"Proszę upewnić się czy na pewno wykonać operację, gdyż nie ma możliwości "
-"powrotu."
+#: admin/fai/askClassName.tpl:48
+msgid "Choose FAI class name from a list of existing classes"
+msgstr "Wybierz nazwę klasy FAI z listy istniejących klas"
 
-#: admin/fai/remove_branch.tpl:10
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
-"anulować."
+#: admin/fai/askClassName.tpl:54
+msgid "Choose class name"
+msgstr "Wybierz nazwę klasy"
 
-#: admin/fai/faiProfileEntry.tpl:6
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr "Lista obiektów FAI (Fully Automatic Installation)"
+#: admin/fai/askClassName.tpl:70 admin/fai/askClassName.tpl:77
+msgid "Use"
+msgstr "Użyj"
 
-#: admin/fai/faiProfileEntry.tpl:26
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr ""
-"To menu umożliwia wybór nazw klas FAI i dodawania ich do obecnie edytowanego "
-"profilu."
+#: admin/fai/askClassName.tpl:74
+msgid "A new class name."
+msgstr "Nowa nazwa klasy"
 
-#: admin/fai/faiProfileEntry.tpl:39
-msgid "Show only classes with templates"
-msgstr "Pokaż tylko klasy z szablonami"
+#: admin/fai/class_divListFai.inc:32
+#, fuzzy
+msgid "List of classes"
+msgstr "Nazwy klas FAI"
 
-#: admin/fai/faiProfileEntry.tpl:41
-msgid "Show only classes with scripts"
-msgstr "Pokaż tylko klasy ze skryptami"
+#: admin/fai/class_divListFai.inc:33
+#, fuzzy
+msgid "List of deployment classes and products"
+msgstr "Pokaż tylko klasy z pakietami"
 
-#: admin/fai/faiProfileEntry.tpl:43
-msgid "Show only classes with hooks"
-msgstr "Pokaż tylko klasy z zaczepami"
+#: admin/fai/class_divListFai.inc:48
+#, fuzzy
+msgid "Select all"
+msgstr "Wybierz"
 
-#: admin/fai/faiProfileEntry.tpl:45
-msgid "Show only classes with variables"
-msgstr "Pokaż tylko klasy ze zmiennymi"
+#: admin/fai/class_divListFai.inc:54
+#, fuzzy
+msgid "Class types"
+msgstr "Typ klasy"
 
-#: admin/fai/faiProfileEntry.tpl:47
-msgid "Show only classes with packages"
-msgstr "Pokaż tylko klasy z pakietami"
+#: admin/fai/class_divListFai.inc:55 admin/fai/class_divListFai.inc:138
+msgid "Actions"
+msgstr "Akcje"
 
-#: admin/fai/faiProfileEntry.tpl:49
-msgid "Show only classes with partitions"
-msgstr "Pokaż tylko klasy z partycjami"
+#: admin/fai/class_divListFai.inc:57 admin/fai/class_divListFai.inc:59
+#: admin/fai/class_divListFai.inc:61 admin/fai/class_divListFai.inc:63
+#: admin/fai/class_divListFai.inc:65 admin/fai/class_divListFai.inc:67
+#: admin/fai/class_divListFai.inc:69 admin/fai/class_divListFai.inc:75
+#: admin/fai/class_divListFai.inc:77
+#, fuzzy, php-format
+msgid "Display objects of type '%s'."
+msgstr "Wyświetl obiekty pasujące"
 
-#: admin/fai/class_askClassName.inc:79 admin/fai/class_askClassName.inc:80
-#: admin/fai/class_askClassName.inc:81 admin/fai/class_askClassName.inc:82
-#: admin/fai/class_askClassName.inc:83 admin/fai/class_askClassName.inc:84
-#: admin/fai/class_askClassName.inc:85 admin/fai/class_askClassName.inc:86
-msgid "Create new FAI object"
-msgstr "Utwórz nowy obiekt FAI"
+#: admin/fai/class_divListFai.inc:58
+msgid "Show profiles"
+msgstr "Pokaż profile"
 
-#: admin/fai/class_faiGroupHandle.inc:102 admin/fai/class_divListFai.inc:164
-#: admin/fai/class_divListFai.inc:210 admin/fai/class_faiSummaryTab.inc:49
-msgid "Package list"
-msgstr "Lista pakietów"
+#: admin/fai/class_divListFai.inc:60
+msgid "Show templates"
+msgstr "Pokaż szablony"
 
-#: admin/fai/class_faiGroupHandle.inc:104 admin/fai/class_divListFai.inc:156
-#: admin/fai/class_divListFai.inc:212 admin/fai/class_faiSummaryTab.inc:44
-msgid "Scripts"
-msgstr "Skrypty"
+#: admin/fai/class_divListFai.inc:62
+msgid "Show scripts"
+msgstr "Pokaż skrypty"
 
-#: admin/fai/class_faiGroupHandle.inc:106 admin/fai/class_divListFai.inc:160
-#: admin/fai/class_divListFai.inc:214 admin/fai/class_faiSummaryTab.inc:46
-msgid "Variables"
-msgstr "Zmienie"
+#: admin/fai/class_divListFai.inc:64 admin/fai/class_faiHook.inc:544
+msgid "Hook"
+msgstr "Zaczep"
 
-#: admin/fai/class_faiGroupHandle.inc:108 admin/fai/class_divListFai.inc:158
-#: admin/fai/class_divListFai.inc:216 admin/fai/class_faiSummaryTab.inc:45
-msgid "Hooks"
-msgstr "Zaczepy"
+#: admin/fai/class_divListFai.inc:64
+msgid "Show hooks"
+msgstr "Pokaż zaczepy"
 
-#: admin/fai/class_faiGroupHandle.inc:112 admin/fai/class_divListFai.inc:220
-#: admin/fai/class_faiSummaryTab.inc:47
-msgid "Templates"
-msgstr "Szablony"
+#: admin/fai/class_divListFai.inc:66
+msgid "Show variables"
+msgstr "Pokaż zmienne"
+
+#: admin/fai/class_divListFai.inc:68
+msgid "Show packages"
+msgstr "Pokaż pakiety"
+
+#: admin/fai/class_divListFai.inc:70
+#, fuzzy
+msgid "Partition"
+msgstr "Nr. Partycji"
+
+#: admin/fai/class_divListFai.inc:70
+msgid "Show partitions"
+msgstr "Pokaż partycje"
 
-#: admin/fai/class_faiGroupHandle.inc:114 admin/fai/class_divListFai.inc:76
-#: admin/fai/class_divListFai.inc:222
+#: admin/fai/class_divListFai.inc:76 admin/fai/class_divListFai.inc:222
+#: admin/fai/class_faiGroupHandle.inc:114
 msgid "OPSI netboot product"
 msgstr ""
 
-#: admin/fai/class_faiGroupHandle.inc:116
-msgid "OPSI local product"
-msgstr ""
+#: admin/fai/class_divListFai.inc:76
+#, fuzzy
+msgid "Show netboot products"
+msgstr "Grupy obiektów"
 
-#: admin/fai/faiPackageConfiguration.tpl:1 admin/fai/class_divListFai.inc:68
-#: admin/fai/class_faiPackage.inc:573
-msgid "Package"
-msgstr "Pakiet"
+#: admin/fai/class_divListFai.inc:78 admin/fai/class_divListFai.inc:224
+#, fuzzy
+msgid "OPSI localboot product"
+msgstr "Grupy obiektów"
 
-#: admin/fai/class_faiScript.inc:314 admin/fai/class_faiScript.inc:316
+#: admin/fai/class_divListFai.inc:78
 #, fuzzy
-msgid "Sort direction"
-msgstr "Sekcja"
+msgid "Show localboot products"
+msgstr "Grupy obiektów"
 
-#: admin/fai/class_faiScript.inc:332
-msgid "Action"
-msgstr "Akcja"
+#: admin/fai/class_divListFai.inc:86
+msgid "Display users matching"
+msgstr "Wyświetl użytkowników pasujących"
 
-#: admin/fai/class_faiScript.inc:638 admin/fai/class_faiHookEntry.inc:199
-msgid "FAI script"
-msgstr "Skrypt FAI"
+#: admin/fai/class_divListFai.inc:140
+msgid "Create"
+msgstr "Utwórz"
 
-#: admin/fai/class_FAI.inc:259 admin/fai/class_FAI.inc:662
+#: admin/fai/class_divListFai.inc:145 admin/fai/faiGroupHandle.tpl:22
 #, fuzzy
-msgid "LDAP error"
-msgstr "błąd LDAP:"
-
-#: admin/fai/class_FAI.inc:535
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr "Błąd, następujące obiekty powinny być równe '%s' oraz '%s'"
+msgid "Freezed"
+msgstr "Częstotliwość"
 
-#: admin/fai/class_FAI.inc:874
-#, php-format
-msgid "Creating group application release for %s"
-msgstr ""
+#: admin/fai/class_divListFai.inc:155
+msgid "PT"
+msgstr "PT"
 
-#: admin/fai/class_FAI.inc:943 admin/fai/class_FAI.inc:965
-#: admin/fai/class_FAI.inc:1005 admin/fai/class_FAI.inc:1010
-#: admin/fai/class_FAI.inc:1048
-msgid "Object"
-msgstr "Obiekt"
+#: admin/fai/class_divListFai.inc:157
+msgid "S"
+msgstr "S"
 
-#: admin/fai/class_FAI.inc:944
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
+#: admin/fai/class_divListFai.inc:159
+msgid "H"
+msgstr "H"
 
-#: admin/fai/class_FAI.inc:966
-#, php-format
-msgid "Adding group application release container %s."
-msgstr ""
+#: admin/fai/class_divListFai.inc:161
+msgid "V"
+msgstr "V"
 
-#: admin/fai/class_FAI.inc:1006
-#, fuzzy, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr "Nie można utworzyć '%s', nazwa docelowa już istnieje."
+#: admin/fai/class_divListFai.inc:162
+#, fuzzy
+msgid "Templates "
+msgstr "Szablony"
 
-#: admin/fai/class_FAI.inc:1011
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr ""
+#: admin/fai/class_divListFai.inc:163
+#, fuzzy
+msgid "I"
+msgstr "NI"
 
-#: admin/fai/class_FAI.inc:1042
-#, php-format
-msgid "Creating copy of %s"
-msgstr "Tworzenie kopii %s"
+#: admin/fai/class_divListFai.inc:165
+msgid "PK"
+msgstr "PK"
 
-#: admin/fai/class_FAI.inc:1045
-msgid "Processing"
-msgstr "Przetwarzanie"
+#: admin/fai/class_divListFai.inc:322 admin/fai/class_divListFai.inc:323
+#: admin/fai/class_divListFai.inc:324 admin/fai/class_divListFai.inc:325
+#: admin/fai/class_divListFai.inc:326 admin/fai/class_divListFai.inc:327
+#: admin/fai/class_divListFai.inc:328 admin/fai/class_divListFai.inc:329
+#: admin/fai/class_divListFai.inc:330 admin/fai/class_divListFai.inc:331
+#, fuzzy, php-format
+msgid "Number of listed %s"
+msgstr "Nazwa departamentu"
 
-#: admin/fai/class_FAI.inc:1063
+#: admin/fai/class_divListFai.inc:322
 #, fuzzy
-msgid "Could not create new release, the destination dn is already in use."
-msgstr "Nie można utworzyć '%s', nazwa docelowa już istnieje."
-
-#: admin/fai/class_FAI.inc:1076
-msgid "Error while fetching source dn - aborted!"
-msgstr "Błąd podczas pobierania źródłowego dn - anulowano!"
+msgid "profiles"
+msgstr "Profile"
 
-#: admin/fai/class_FAI.inc:1158
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr ""
+#: admin/fai/class_divListFai.inc:323
+#, fuzzy
+msgid "partitions"
+msgstr "partycja %s"
 
-#: admin/fai/class_faiScriptEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
+#: admin/fai/class_divListFai.inc:324
 #, fuzzy
-msgid "file is empty"
-msgstr "Wybrany plik jest pusty"
+msgid "scripts"
+msgstr "Skrypt"
 
-#: admin/fai/class_faiScriptEntry.inc:181
-#: admin/fai/class_faiScriptEntry.inc:191
+#: admin/fai/class_divListFai.inc:325
 #, fuzzy
-msgid "Script entry"
-msgstr "Zawartość skryptu"
+msgid "hooks"
+msgstr "Zaczep"
 
-#: admin/fai/class_faiScriptEntry.inc:182
+#: admin/fai/class_divListFai.inc:326
 #, fuzzy
-msgid "FAI script entry"
-msgstr "Skrypt FAI"
+msgid "variables"
+msgstr "Zmienna"
 
-#: admin/fai/class_faiScriptEntry.inc:192
+#: admin/fai/class_divListFai.inc:327
 #, fuzzy
-msgid "Script Priority"
-msgstr "Priorytet skryptu"
+msgid "templates"
+msgstr "Szablon"
 
-#: admin/fai/faiSummary.tpl:4
-msgid "FAI object tree"
-msgstr "Drzewo obiektów FAI"
+#: admin/fai/class_divListFai.inc:328
+#, fuzzy
+msgid "packages"
+msgstr "Pakiety"
 
-#: admin/fai/faiSummary.tpl:11
-msgid "Reload class and release configuration from parent object."
-msgstr "Przeładuj klasę i uwolnij konfigurację z obiektu nadrzędnego."
+#: admin/fai/class_divListFai.inc:329
+#, fuzzy
+msgid "departments"
+msgstr "Zatwierdź departament"
 
-#: admin/fai/faiSummary.tpl:22
+#: admin/fai/class_divListFai.inc:330
 #, fuzzy
-msgid "You are not allowed to view the fai summary."
-msgstr "Brak uprawnień do usunięcia tego użytkownika!"
+msgid "netboot products"
+msgstr "Grupy obiektów"
 
-#: admin/fai/faiTemplate.tpl:34
-msgid "List of template files"
-msgstr "Lista plików szablonów"
+#: admin/fai/class_divListFai.inc:331
+#, fuzzy
+msgid "localboot products"
+msgstr "Grupy obiektów"
 
-#: admin/fai/class_faiPartitionTable.inc:301
-#: admin/fai/class_faiPartitionTable.inc:307
-#, php-format
-msgid "%s partition"
-msgstr "partycja %s"
+#: admin/fai/faiScript.tpl:39
+msgid "List of scripts"
+msgstr "Lista skryptów"
 
-#: admin/fai/class_faiPartitionTable.inc:303
-#: admin/fai/class_faiPartitionTable.inc:309
-#, php-format
-msgid "%s partition(s)"
-msgstr "partycje %s"
+#: admin/fai/class_debconfTemplate.inc:220
+msgid "This package has no debconf options."
+msgstr "Ten pakiet nie ma opcji debconf."
 
-#: admin/fai/class_faiPartitionTable.inc:542
-msgid "FAI partition table"
-msgstr "Tablica partycji FAI"
+#: admin/fai/class_debconfTemplate.inc:266
+msgid ""
+"This debconf question is dynamically generated during package installation "
+"and requires choosing between specific options which cannot be presented "
+"here. The entered text needs to be one of the valid choices in order to take "
+"effect."
+msgstr ""
 
-#: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/class_servRepository.inc:358
+#: admin/fai/faiTemplateEntry.tpl:10 admin/fai/class_faiTemplateEntry.inc:220
 #, fuzzy
-msgid "Releases"
-msgstr "Wersja"
+msgid "File name"
+msgstr "Nazwa pliku"
 
-#: admin/fai/branch_selector.tpl:8
-msgid "Current release"
-msgstr "Obecne wydanie"
+#: admin/fai/faiTemplateEntry.tpl:21 admin/fai/class_faiTemplateEntry.inc:215
+msgid "Destination path"
+msgstr "Ścieżka docelowa"
 
-#: admin/fai/branch_selector.tpl:20 admin/fai/branch_selector.tpl:26
-#, fuzzy
-msgid "Create release"
-msgstr "Obecne wydanie"
+#: admin/fai/faiTemplateEntry.tpl:45
+msgid "Template attributes"
+msgstr "Atrybuty szablonu"
 
-#: admin/fai/branch_selector.tpl:23 admin/fai/branch_selector.tpl:29
-#, fuzzy
-msgid "Create read-only release"
-msgstr "Obecne wydanie"
+#: admin/fai/faiTemplateEntry.tpl:53 admin/fai/class_faiTemplateEntry.inc:211
+msgid "File"
+msgstr "Plik"
 
-#: admin/fai/branch_selector.tpl:28
+#: admin/fai/faiTemplateEntry.tpl:60
+msgid "Save template"
+msgstr "Zapisz szablon"
+
+#: admin/fai/faiTemplateEntry.tpl:69
+msgid "Upload"
+msgstr "Wgraj"
+
+#: admin/fai/faiTemplateEntry.tpl:76
 #, fuzzy
-msgid "Freeze"
-msgstr "Częstotliwość"
+msgid "Full path"
+msgstr "Ścieżka do fontów"
 
-#: admin/fai/branch_selector.tpl:35
-msgid "Delete current release"
-msgstr "Usuń bieżące wydanie"
+#: admin/fai/faiTemplateEntry.tpl:92
+msgid "Owner"
+msgstr "Właściciel"
 
-#: admin/fai/faiVariableEntry.tpl:33
-msgid "Variable attributes"
-msgstr "Atrybuty zmiennych"
+#: admin/fai/faiTemplateEntry.tpl:103 admin/fai/faiTemplateEntry.tpl:145
+#: admin/fai/class_faiTemplateEntry.inc:230
+#: admin/fai/class_faiTemplateEntry.inc:233
+#: admin/fai/class_faiTemplateEntry.inc:235
+msgid "Group"
+msgstr "Grupa"
 
-#: admin/fai/class_faiHookEntry.inc:188
-#, fuzzy
-msgid "Hook entry"
-msgstr "Usuń pozycję"
+#: admin/fai/faiTemplateEntry.tpl:114
+msgid "Access"
+msgstr "Dostęp"
 
-#: admin/fai/class_faiHookEntry.inc:189
-#, fuzzy
-msgid "FAI hook entry"
-msgstr "Zaczep FAI"
+#: admin/fai/faiTemplateEntry.tpl:120
+msgid "Class"
+msgstr "Klasa"
 
-#: admin/fai/faiNewBranch.tpl:5
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-"Zamierzasz utworzyć gałąź lub zablokowaną gałąź. Ta akcja klonuje istniejące "
-"wydanie do innej nazwy wydania. Gałęzie mogą być zwyczajnie modyfikowane. "
-"Klasy FAI zablokowanych gałęzi nie mogą być modyfikowane, można tylko "
-"dodawać klasy. Nazwy gałęzi powinny składać się ze znaków alfanumerycznych i "
-"nie zawierać zarezerwowanych nazw 'scripts', 'hooks', 'partitions', "
-"'variables', 'templates', oraz 'fai'."
+#: admin/fai/faiTemplateEntry.tpl:121
+msgid "Read"
+msgstr "Odczyt"
 
-#: admin/fai/faiNewBranch.tpl:7
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new "
-"release called SARGE/1.0.2."
-msgstr ""
+#: admin/fai/faiTemplateEntry.tpl:122
+msgid "Write"
+msgstr "Zapis"
 
-#: admin/fai/faiNewBranch.tpl:13
-msgid "Please enter a name for the branch"
-msgstr "Proszę podać nazwę gałęzi"
+#: admin/fai/faiTemplateEntry.tpl:123
+msgid "Execute"
+msgstr "Uruchom"
 
-#: admin/fai/faiNewBranch.tpl:34
-msgid "Processing the requested operation"
-msgstr "Przetwarzam zadaną operację"
+#: admin/fai/faiTemplateEntry.tpl:125
+msgid "Special"
+msgstr "Specjalne"
 
-#: admin/fai/faiNewBranch.tpl:35
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management "
-"dialog."
-msgstr ""
-"Jak tylko operacja kopiowania zakończy się, można przewinąć stronę na dół i "
-"nacisnąć przycisk 'Kontynuuj' aby przejść do dialogu zarządzania FAI."
+#: admin/fai/faiTemplateEntry.tpl:128 admin/fai/class_faiTemplateEntry.inc:224
+#: admin/fai/class_faiTemplateEntry.inc:226
+msgid "User"
+msgstr "Użytkownik"
 
-#: admin/fai/faiNewBranch.tpl:41
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-"Twoja przeglądarka nie obsługuje iframes, proszę użyć tego linku aby wykonać "
-"żądaną operację."
+#: admin/fai/faiTemplateEntry.tpl:142
+msgid "SUID"
+msgstr "SUID"
 
-#: admin/fai/faiNewBranch.tpl:43
-msgid "Perform requested operation."
-msgstr "Wykonaj żądaną operację."
+#: admin/fai/faiTemplateEntry.tpl:159
+msgid "SGID"
+msgstr "SGID"
 
-#: admin/fai/faiNewBranch.tpl:43
-msgid "Initiate operation"
-msgstr "Zainicjiuj operację"
+#: admin/fai/faiTemplateEntry.tpl:162
+msgid "Others"
+msgstr "Inne"
 
-#: admin/fai/askClassName.tpl:6
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to "
-"specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr ""
-"Dodawanie nowej klasy do zarządzania FAI wymaga nazwy klasy. Należy podać "
-"unikalną nazwę klasy dla unikalnych typów klas FAI, podczas gdy można użyć "
-"tej samej nazwy klasy dla różnych typów klas FAI. W ostatnim przypadku, FAI "
-"automatycznie połączy wszystkie różne typy klas w jedną unikalną nazwę klasy."
+#: admin/fai/faiTemplateEntry.tpl:176
+msgid "sticky"
+msgstr "sticky"
 
-#: admin/fai/askClassName.tpl:12
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr ""
-"Proszę użyć jedną z poniższych metod dla wybrania nazwy nowej klasy FAI."
+#: admin/fai/class_faiScript.inc:309 admin/fai/class_faiScript.inc:311
+#, fuzzy
+msgid "Sort direction"
+msgstr "Sekcja"
 
-#: admin/fai/askClassName.tpl:26
-msgid "Enter FAI class name manually"
-msgstr "Podaj nazwę klasy FAI ręcznie"
+#: admin/fai/class_faiScript.inc:323 admin/fai/faiScriptEntry.tpl:38
+msgid "Priority"
+msgstr "Priorytet"
 
-#: admin/fai/askClassName.tpl:48
-msgid "Choose FAI class name from a list of existing classes"
-msgstr "Wybierz nazwę klasy FAI z listy istniejących klas"
+#: admin/fai/class_faiScript.inc:327
+msgid "Action"
+msgstr "Akcja"
 
-#: admin/fai/askClassName.tpl:54
-msgid "Choose class name"
-msgstr "Wybierz nazwę klasy"
+#: admin/fai/class_faiScript.inc:630 admin/fai/class_faiHookEntry.inc:199
+msgid "FAI script"
+msgstr "Skrypt FAI"
 
-#: admin/fai/askClassName.tpl:70 admin/fai/askClassName.tpl:77
-msgid "Use"
-msgstr "Użyj"
+#: admin/fai/faiScriptEntry.tpl:33
+msgid "Properties"
+msgstr "Właściwości"
 
-#: admin/fai/askClassName.tpl:74
-msgid "A new class name."
-msgstr "Nowa nazwa klasy"
+#: admin/fai/faiScriptEntry.tpl:33 admin/fai/faiScriptEntry.tpl:54
+msgid "Script attributes"
+msgstr "Atrybuty skryptu"
 
-#: admin/fai/class_faiPackageConfiguration.inc:68
-#, php-format
-msgid "Debconf information for package '%s'"
-msgstr "Informacja Debconf dla pakietu '%s'"
+#: admin/fai/faiScriptEntry.tpl:43
+msgid ""
+"Choose a priority. Low values result in an earlier, high values in a later "
+"execution."
+msgstr ""
 
-#: admin/fai/class_faiVariable.inc:389 admin/fai/class_divListFai.inc:60
-#: admin/fai/class_divListFai.inc:66
-msgid "Variable"
-msgstr "Zmienna"
+#: admin/fai/faiScriptEntry.tpl:75 admin/fai/faiHookEntry.tpl:75
+msgid "Import script"
+msgstr "Importuj skrypt"
 
-#: admin/fai/class_faiVariable.inc:390
-msgid "FAI variable"
-msgstr "Zmienna FAI"
+#: admin/fai/class_faiTemplateEntry.inc:90
+msgid "no file uploaded yet"
+msgstr "Nie wgrano jeszcze żadnego pliku"
 
-#: admin/fai/class_divListFai.inc:32
-#, fuzzy
-msgid "List of classes"
-msgstr "Nazwy klas FAI"
+#: admin/fai/class_faiTemplateEntry.inc:96
+#, php-format
+msgid "exists in database (size: %s bytes)"
+msgstr "istnieje w bazie danych (rozmiar %s bajtów)"
 
-#: admin/fai/class_divListFai.inc:33
+#: admin/fai/class_faiTemplateEntry.inc:265
 #, fuzzy
-msgid "List of deployment classes and products"
-msgstr "Pokaż tylko klasy z pakietami"
+msgid "Template entry"
+msgstr "Szablon użytkownika"
 
-#: admin/fai/class_divListFai.inc:48
+#: admin/fai/class_faiTemplateEntry.inc:266
 #, fuzzy
-msgid "Select all"
-msgstr "Wybierz"
+msgid "FAI template entry"
+msgstr "Szablon FAI"
 
-#: admin/fai/class_divListFai.inc:54
-#, fuzzy
-msgid "Class types"
-msgstr "Typ klasy"
+#: admin/fai/class_faiTemplateEntry.inc:275
+msgid "Template file"
+msgstr "Plik szablonu"
 
-#: admin/fai/class_divListFai.inc:55 admin/fai/class_divListFai.inc:138
-msgid "Actions"
-msgstr "Akcje"
+#: admin/fai/class_faiTemplateEntry.inc:276
+msgid "Template path"
+msgstr "Ścieżka szablonu"
 
-#: admin/fai/class_divListFai.inc:57 admin/fai/class_divListFai.inc:59
-#: admin/fai/class_divListFai.inc:61 admin/fai/class_divListFai.inc:63
-#: admin/fai/class_divListFai.inc:65 admin/fai/class_divListFai.inc:67
-#: admin/fai/class_divListFai.inc:69 admin/fai/class_divListFai.inc:75
-#: admin/fai/class_divListFai.inc:77
-#, fuzzy, php-format
-msgid "Display objects of type '%s'."
-msgstr "Wyświetl obiekty pasujące"
+#: admin/fai/class_faiTemplateEntry.inc:277
+msgid "File owner"
+msgstr "Właściciel pliku"
 
-#: admin/fai/class_divListFai.inc:58
-msgid "Show profiles"
-msgstr "Pokaż profile"
+#: admin/fai/class_faiTemplateEntry.inc:278
+msgid "File permissions"
+msgstr "Uprawnienia pliku"
 
-#: admin/fai/class_divListFai.inc:60
-msgid "Show templates"
-msgstr "Pokaż szablony"
+#: admin/fai/faiTemplate.tpl:34
+msgid "List of template files"
+msgstr "Lista plików szablonów"
 
-#: admin/fai/class_divListFai.inc:62
-msgid "Show scripts"
-msgstr "Pokaż skrypty"
+#: admin/fai/class_faiPackageConfiguration.inc:71
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr "Informacja Debconf dla pakietu '%s'"
 
-#: admin/fai/class_divListFai.inc:64
-msgid "Show hooks"
-msgstr "Pokaż zaczepy"
+#: admin/fai/faiDebconfConfigurations.tpl:4
+msgid "Add"
+msgstr "Dodaj"
 
-#: admin/fai/class_divListFai.inc:66
-msgid "Show variables"
-msgstr "Pokaż zmienne"
+#: admin/fai/class_faiGroupHandle.inc:116
+msgid "OPSI local product"
+msgstr ""
 
-#: admin/fai/class_divListFai.inc:68
-msgid "Show packages"
-msgstr "Pokaż pakiety"
+#: admin/fai/class_NewDebconfConfiguration.inc:119
+#, php-format
+msgid ""
+"The specified value '%s' for the variable type boolean is invalid."
+"<br><i>Allowed values: true, false, 1, 0.</i>"
+msgstr ""
 
-#: admin/fai/class_divListFai.inc:70
-#, fuzzy
-msgid "Partition"
-msgstr "Nr. Partycji"
+#: admin/fai/faiHookEntry.tpl:33 admin/fai/faiHookEntry.tpl:54
+msgid "Hook attributes"
+msgstr "Atrybuty zaczepu"
 
-#: admin/fai/class_divListFai.inc:70
-msgid "Show partitions"
-msgstr "Pokaż partycje"
+#: admin/fai/faiHookEntry.tpl:38 admin/fai/class_faiHookEntry.inc:198
+msgid "Task"
+msgstr "Zadanie"
 
-#: admin/fai/class_divListFai.inc:76
-#, fuzzy
-msgid "Show netboot products"
-msgstr "Grupy obiektów"
+#: admin/fai/faiHookEntry.tpl:41
+msgid "Choose an existing FAI task"
+msgstr "Proszę wybrać istniejące zadanie FAI"
 
-#: admin/fai/class_divListFai.inc:78 admin/fai/class_divListFai.inc:224
-#, fuzzy
-msgid "OPSI localboot product"
-msgstr "Grupy obiektów"
+#: admin/fai/faiHook.tpl:39
+msgid "List of hook scripts"
+msgstr "Lista zaczepionych slryptów"
 
-#: admin/fai/class_divListFai.inc:78
+#: admin/fai/class_FAI.inc:261 admin/fai/class_FAI.inc:690
 #, fuzzy
-msgid "Show localboot products"
-msgstr "Grupy obiektów"
+msgid "LDAP error"
+msgstr "błąd LDAP:"
 
-#: admin/fai/class_divListFai.inc:86
-msgid "Display users matching"
-msgstr "Wyświetl użytkowników pasujących"
+#: admin/fai/class_FAI.inc:548
+#, php-format
+msgid "Error, following objects should be equal '%s' and '%s'"
+msgstr "Błąd, następujące obiekty powinny być równe '%s' oraz '%s'"
 
-#: admin/fai/class_divListFai.inc:140
-msgid "Create"
-msgstr "Utwórz"
+#: admin/fai/class_FAI.inc:902
+#, php-format
+msgid "Creating group application release for %s"
+msgstr ""
 
-#: admin/fai/class_divListFai.inc:155
-msgid "PT"
-msgstr "PT"
+#: admin/fai/class_FAI.inc:971 admin/fai/class_FAI.inc:993
+#: admin/fai/class_FAI.inc:1033 admin/fai/class_FAI.inc:1038
+#: admin/fai/class_FAI.inc:1076
+msgid "Object"
+msgstr "Obiekt"
 
-#: admin/fai/class_divListFai.inc:157
-msgid "S"
-msgstr "S"
+#: admin/fai/class_FAI.inc:972
+#, php-format
+msgid "Adding missing group application release container %s."
+msgstr ""
+
+#: admin/fai/class_FAI.inc:994
+#, php-format
+msgid "Adding group application release container %s."
+msgstr ""
+
+#: admin/fai/class_FAI.inc:1034
+#, fuzzy, php-format
+msgid "Could not create menu entry %s. (Already exists)."
+msgstr "Nie można utworzyć '%s', nazwa docelowa już istnieje."
+
+#: admin/fai/class_FAI.inc:1039
+#, php-format
+msgid "Created group application menu entry for %s."
+msgstr ""
+
+#: admin/fai/class_FAI.inc:1070
+#, php-format
+msgid "Creating copy of %s"
+msgstr "Tworzenie kopii %s"
+
+#: admin/fai/class_FAI.inc:1073
+msgid "Processing"
+msgstr "Przetwarzanie"
+
+#: admin/fai/class_FAI.inc:1091
+#, fuzzy
+msgid "Could not create new release, the destination dn is already in use."
+msgstr "Nie można utworzyć '%s', nazwa docelowa już istnieje."
 
-#: admin/fai/class_divListFai.inc:159
-msgid "H"
-msgstr "H"
+#: admin/fai/class_FAI.inc:1104
+msgid "Error while fetching source dn - aborted!"
+msgstr "Błąd podczas pobierania źródłowego dn - anulowano!"
 
-#: admin/fai/class_divListFai.inc:161
-msgid "V"
-msgstr "V"
+#: admin/fai/class_FAI.inc:1186
+#, php-format
+msgid ""
+"Release creation failed due to ldap errors. Additional informations '%s'."
+msgstr ""
 
-#: admin/fai/class_divListFai.inc:162
+#: admin/fai/paste_generic.tpl:1
 #, fuzzy
-msgid "Templates "
-msgstr "Szablony"
+msgid "FAI settings"
+msgstr "Klasy FAI"
 
-#: admin/fai/class_divListFai.inc:163
-#, fuzzy
-msgid "I"
-msgstr "NI"
+#: admin/fai/class_faiProfileEntry.inc:172 admin/fai/class_faiProfile.inc:290
+msgid "This list displays all assigned class names for this profile."
+msgstr "Ta lista wyświetla wszystkie przypisane nazwy klas dla tego profilu."
 
-#: admin/fai/class_divListFai.inc:165
-msgid "PK"
-msgstr "PK"
+#: admin/fai/class_faiHook.inc:545
+msgid "FAI hook"
+msgstr "Zaczep FAI"
 
-#: admin/fai/class_divListFai.inc:313 admin/fai/class_divListFai.inc:314
-#: admin/fai/class_divListFai.inc:315 admin/fai/class_divListFai.inc:316
-#: admin/fai/class_divListFai.inc:317 admin/fai/class_divListFai.inc:318
-#: admin/fai/class_divListFai.inc:319 admin/fai/class_divListFai.inc:320
-#: admin/fai/class_divListFai.inc:321 admin/fai/class_divListFai.inc:322
-#, fuzzy, php-format
-msgid "Number of listed '%s'"
-msgstr "Nazwa departamentu"
+#: admin/fai/class_faiProfile.inc:301
+msgid "Remove class from profile"
+msgstr "Usuń klasę z profilu"
 
-#: admin/fai/class_divListFai.inc:313
-#, fuzzy
-msgid "profiles"
-msgstr "Profile"
+#: admin/fai/class_faiProfile.inc:304
+msgid "Up"
+msgstr "Góra"
 
-#: admin/fai/class_divListFai.inc:314
-#, fuzzy
-msgid "partitions"
-msgstr "partycja %s"
+#: admin/fai/class_faiProfile.inc:305
+msgid "Down"
+msgstr "W dół"
 
-#: admin/fai/class_divListFai.inc:315
-#, fuzzy
-msgid "scripts"
-msgstr "Skrypt"
+#: admin/fai/class_faiProfile.inc:409
+msgid "No class specified for this profile!"
+msgstr ""
 
-#: admin/fai/class_divListFai.inc:316
-#, fuzzy
-msgid "hooks"
-msgstr "Zaczep"
+#: admin/fai/class_faiProfile.inc:490
+msgid "FAI profile"
+msgstr "Profil FAI"
 
-#: admin/fai/class_divListFai.inc:317
-#, fuzzy
-msgid "variables"
-msgstr "Zmienna"
+#: admin/fai/class_faiProfile.inc:499 admin/fai/faiProfile.tpl:36
+msgid "FAI classes"
+msgstr "Klasy FAI"
 
-#: admin/fai/class_divListFai.inc:318
+#: admin/fai/class_faiHookEntry.inc:188
 #, fuzzy
-msgid "templates"
-msgstr "Szablon"
+msgid "Hook entry"
+msgstr "Usuń pozycję"
 
-#: admin/fai/class_divListFai.inc:319
+#: admin/fai/class_faiHookEntry.inc:189
 #, fuzzy
-msgid "packages"
-msgstr "Pakiety"
+msgid "FAI hook entry"
+msgstr "Zaczep FAI"
+
+#: admin/fai/class_faiVariable.inc:390
+msgid "FAI variable"
+msgstr "Zmienna FAI"
 
-#: admin/fai/class_divListFai.inc:320
+#: admin/fai/class_faiVariableEntry.inc:94
 #, fuzzy
-msgid "departments"
-msgstr "Zatwierdź departament"
+msgid "Content"
+msgstr "Kontynuuj"
 
-#: admin/fai/class_divListFai.inc:321
+#: admin/fai/class_faiVariableEntry.inc:129
 #, fuzzy
-msgid "netboot products"
-msgstr "Grupy obiektów"
+msgid "Variable entry"
+msgstr "Zawartość zmiennych"
 
-#: admin/fai/class_divListFai.inc:322
+#: admin/fai/class_faiVariableEntry.inc:130
 #, fuzzy
-msgid "localboot products"
-msgstr "Grupy obiektów"
+msgid "FAI variable entry "
+msgstr "Zmienna FAI"
+
+#: admin/fai/class_faiPackage.inc:236
+msgid "Invalid package names"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:237
+#, php-format
+msgid "The following package names don't match the Debian policy: %s"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:329 admin/fai/class_faiPackage.inc:330
+#: admin/fai/class_faiPackage.inc:447 admin/fai/class_faiPackage.inc:448
 #, fuzzy
 msgid "Configured"
 msgstr "Konfiguruj"
 
-#: admin/fai/class_faiPackage.inc:336 admin/fai/class_faiPackage.inc:337
+#: admin/fai/class_faiPackage.inc:454 admin/fai/class_faiPackage.inc:455
 msgid "Package marked for removal"
 msgstr "Pakiet zaznaczony do usunięcia"
 
-#: admin/fai/class_faiPackage.inc:353
+#: admin/fai/class_faiPackage.inc:471
 #, fuzzy
 msgid "Mark package for removal"
 msgstr "Pakiet zaznaczony do usunięcia"
 
-#: admin/fai/class_faiPackage.inc:359
+#: admin/fai/class_faiPackage.inc:477
 msgid "Configure this package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:363
+#: admin/fai/class_faiPackage.inc:481
 msgid "Remove this package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:442
+#: admin/fai/class_faiPackage.inc:561
 #, fuzzy
 msgid "Please select a least one package!"
 msgstr "Prosze wybrać przynajmniej jeden pakiet."
 
-#: admin/fai/class_faiPackage.inc:446
+#: admin/fai/class_faiPackage.inc:565
 #, fuzzy
 msgid ""
 "Please choose a valid release/section combination for your repository setup!"
 msgstr "Proszę wybrać poprawną kombinację dla ustawień repozytorium."
 
-#: admin/fai/class_faiPackage.inc:574
+#: admin/fai/class_faiPackage.inc:727
 msgid "FAI Package list"
 msgstr "Lista pakietów FAI"
 
-#: admin/fai/class_faiPackage.inc:583
+#: admin/fai/class_faiPackage.inc:736
 msgid "Packages"
 msgstr "Pakiety"
 
-#: admin/fai/class_faiPackage.inc:585
+#: admin/fai/class_faiPackage.inc:738
 msgid "Install Method"
 msgstr "Metoda instalacji"
 
-#: admin/fai/class_faiPackage.inc:586
+#: admin/fai/class_faiPackage.inc:739
 #, fuzzy
 msgid "Package configuration"
 msgstr "Konfiguracja bazy FAX"
 
-#: admin/fai/class_faiTemplateEntry.inc:90
-msgid "no file uploaded yet"
-msgstr "Nie wgrano jeszcze żadnego pliku"
-
-#: admin/fai/class_faiTemplateEntry.inc:96
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr "istnieje w bazie danych (rozmiar %s bajtów)"
-
-#: admin/fai/class_faiTemplateEntry.inc:265
-#, fuzzy
-msgid "Template entry"
-msgstr "Szablon użytkownika"
-
-#: admin/fai/class_faiTemplateEntry.inc:266
-#, fuzzy
-msgid "FAI template entry"
-msgstr "Szablon FAI"
-
-#: admin/fai/class_faiTemplateEntry.inc:275
-msgid "Template file"
-msgstr "Plik szablonu"
-
-#: admin/fai/class_faiTemplateEntry.inc:276
-msgid "Template path"
-msgstr "Ścieżka szablonu"
-
-#: admin/fai/class_faiTemplateEntry.inc:277
-msgid "File owner"
-msgstr "Właściciel pliku"
-
-#: admin/fai/class_faiTemplateEntry.inc:278
-msgid "File permissions"
-msgstr "Uprawnienia pliku"
-
-#: admin/fai/class_faiSummaryTab.inc:50
-msgid "Profiles"
-msgstr "Profile"
-
-#: admin/fai/class_faiSummaryTab.inc:89
-msgid "Unknown FAI information source!"
-msgstr ""
-
-#: admin/fai/class_faiSummaryTab.inc:178
-#: admin/systems/services/repository/class_servRepository.inc:93
-msgid "You can't use this plugin until FAI is activated."
-msgstr ""
-
-#: admin/fai/class_faiSummaryTab.inc:220
-msgid "This object has no FAI classes assigned."
-msgstr "Ten obiekt nie ma przypisanych klas FAI."
-
-#: admin/fai/class_faiSummaryTab.inc:233
-msgid "Open"
-msgstr "Otwórz"
-
-#: admin/fai/class_faiSummaryTab.inc:239
-msgid "Close"
-msgstr "Zamknij"
-
-#: admin/fai/class_faiSummaryTab.inc:342
-msgid "No."
-msgstr "Nie."
-
-#: admin/fai/class_faiSummaryTab.inc:344
-msgid "FS options"
-msgstr "Opcje systemu plików"
-
 #: admin/fai/faiPartitionTable.tpl:38
 msgid "Discs"
 msgstr "Dyski"
@@ -1491,65 +1599,70 @@ msgstr "Dyski"
 msgid "Choose a disk to delete or edit"
 msgstr "Wybierz dysk do usunięcia lub edycji"
 
-#: admin/fai/class_debconfTemplate.inc:207
-msgid "This package has no debconf options."
-msgstr "Ten pakiet nie ma opcji debconf."
+#: admin/fai/faiGroupHandle.tpl:3
+#, fuzzy
+msgid "Please select the objects you want to remove:"
+msgstr "Proszę podać nową nazwę."
 
-#: admin/systems/services/repository/class_divListRepositories.inc:19
+#: admin/fai/faiGroupHandle.tpl:30
 #, fuzzy
-msgid "List of configured repositories"
-msgstr "Lista użytkowników"
+msgid "Select the object you want to edit:"
+msgstr "Wybierz obiekty do dodania"
 
-#: admin/systems/services/repository/class_divListRepositories.inc:20
+#: admin/fai/faiGroupHandle.tpl:53
 #, fuzzy
-msgid "This menu allows you to create, delete and edit repository settings."
-msgstr "To menu umożliwia tworzenie, usuwanie oraz edycję klas FAI."
+msgid "Select the object you want to copy:"
+msgstr "Wybierz aby zobaczyć grupy GOsa"
 
-#: admin/systems/services/repository/class_divListRepositories.inc:24
-#: admin/systems/services/repository/class_divListRepositories.inc:64
-#: admin/systems/services/repository/servRepositorySetup.tpl:39
-#: admin/systems/services/repository/class_servRepository.inc:360
+#: admin/fai/faiGroupHandle.tpl:76
 #, fuzzy
-msgid "Sections"
-msgstr "Sekcja"
+msgid "Select the object you want to cut:"
+msgstr "Wybierz aby zobaczyć grupy GOsa"
 
-#: admin/systems/services/repository/class_divListRepositories.inc:25
-msgid "Options"
-msgstr "Opcje"
+#: admin/fai/faiPartitionTableEntry.tpl:2
+msgid "Device"
+msgstr "Urządzenie"
 
-#: admin/systems/services/repository/class_divListRepositories.inc:33
-#, fuzzy
-msgid "Add repository"
-msgstr "Katalog"
+#: admin/fai/faiPartitionTableEntry.tpl:24
+msgid "Partition entries"
+msgstr "Partycje"
 
-#: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:357
-#, fuzzy
-msgid "Parent server"
-msgstr "Zachowaj"
+#: admin/fai/faiPartitionTableEntry.tpl:29
+#: admin/fai/faiPartitionTableEntry.tpl:31
+msgid "Add partition"
+msgstr "Dodaj partycje"
 
-#: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:359
-#: admin/systems/services/repository/class_servRepositorySetup.inc:157
-msgid "URL"
-msgstr ""
+#: admin/fai/faiProfile.tpl:37
+msgid "Choose a priority"
+msgstr "Wybierz priorytet"
 
-#: admin/systems/services/repository/class_servRepository.inc:26
-#: admin/systems/services/repository/class_servRepository.inc:308
-#: admin/systems/services/repository/class_servRepository.inc:344
-#: admin/systems/services/repository/class_servRepositorySetup.inc:204
-#, fuzzy
-msgid "Repository service"
-msgstr "Repozytorium"
+#: admin/fai/class_faiPackageEntry.inc:38
+msgid "Please enter your search string here"
+msgstr "Proszę podać szukany ciąg znaków"
 
-#: admin/systems/services/repository/class_servRepository.inc:142
-#, fuzzy
-msgid "FAI release"
-msgstr "Klasy FAI"
+#: admin/fai/class_faiPackageEntry.inc:103
+msgid ""
+"This list displays all assigned package names for this repository settings."
+msgstr ""
+"Ta lista wyświetla wszystkie przypisane nazwy pakietó dla tych ustawień "
+"repozytorium."
 
-#: admin/systems/services/repository/class_servRepository.inc:344
-msgid "Services"
-msgstr "Usługi"
+#: admin/fai/remove.tpl:7
+msgid ""
+"This includes 'all' object information. Please double check if your really "
+"want to do this since there is no way for GOsa to get your data back."
+msgstr ""
+"Operacja odnosi się do 'wszystkich' informacji obiektowych. Proszę upewnić "
+"się, czy na pewno wykonać tą operację, gdyż nie ma możliwości powrotu."
+
+#: admin/fai/remove.tpl:11
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your LDAP tree in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Przed wykonaniem tej operacji zaleca się wykonanie kopii bezpieczeństwa "
+"drzewa LDAP. Naciśnij 'Usuń' aby kontynuować, lub 'Anuluj' aby przerwać."
 
 #, fuzzy
 #~ msgid "Deployment status"
@@ -1576,10 +1689,6 @@ msgstr "Usługi"
 #~ msgid "Import"
 #~ msgstr "Import"
 
-#, fuzzy
-#~ msgid "Resume"
-#~ msgstr "Usuń"
-
 #, fuzzy
 #~ msgid "Pause"
 #~ msgstr "Wklej"
@@ -1745,9 +1854,6 @@ msgstr "Usługi"
 #~ msgid "Create '%s' job"
 #~ msgstr "Utwórz obiekty"
 
-#~ msgid "Add"
-#~ msgstr "Dodaj"
-
 #~ msgid "Apply"
 #~ msgstr "Zastosuj"
 
@@ -2094,9 +2200,6 @@ msgstr "Usługi"
 #~ msgid "The given class name is empty."
 #~ msgstr "Podana klasa jest pusta."
 
-#~ msgid "The specified class name is already in use for this object type."
-#~ msgstr "Podana nazwa klasy jest już używana dla tego typu obiektu."
-
 #, fuzzy
 #~ msgid "There is already a variable with the given name."
 #~ msgstr "Już istnieje wgrany plik z tą samą nazwą."
-- 
2.30.2