moving from gosa.conf to fusiondirectory.conf

contrib/openldap/fd-samba3.ldif

@@ -230,7 +230,7 @@ olcObjectClasses: {18}( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject
  RAL MUST ( gosaSnapshotType $ gosaSnapshotTimestamp $ gosaSnapshotDN $ gosaSn
  apshotData ) MAY description )
 olcObjectClasses: {19}( 1.3.6.1.4.1.10098.1.2.1.19.20 NAME 'gosaConfig' DESC '
- Settings for gosa. Replaces parts of the gosa.conf. (v2.6)' SUP top STRUCTURA
+ Settings for gosa. Replaces parts of the fusiondirectory.conf. (v2.6)' SUP top STRUCTURA
  L MAY gosaSetting )
 olcObjectClasses: {20}( 1.3.6.1.4.1.10098.1.2.1.43 NAME 'gotoSubmenuEntry' DES
  C 'GOto - contains environment settings (v2.6)' SUP top STRUCTURAL MUST cn MA

contrib/openldap/fd-samba3.schema

@@ -393,7 +393,7 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject'
        MAY  ( description ) )
 
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.20 NAME 'gosaConfig'
-       DESC 'Settings for gosa. Replaces parts of the gosa.conf. (v2.6)' SUP top STRUCTURAL
+       DESC 'Settings for gosa. Replaces parts of the fusiondirectory.conf. (v2.6)' SUP top STRUCTURAL
        MAY  ( gosaSetting ) )
 
 # GOto submenu entries

include/class_SnapshotHandler.inc

@@ -253,7 +253,7 @@ class SnapshotHandler {
       return;
     }
 
-    /* Get configuration from gosa.conf */
+    /* Get configuration from fusiondirectory.conf */
     $config = $this->config;
 
     /* Create lokal ldap connection */

include/class_config.inc

@@ -24,7 +24,7 @@
  *  \ingroup coreclasses
  *
  * The configuration class, responsible for parsing and querying the
- * gosa configuration file.
+ * fusiondirectory configuration file.
  */
 
 class config  {
@@ -149,7 +149,7 @@ class config  {
     $xmldata= fread($fh, 100000);
     fclose($fh);
     if(!xml_parse($this->parser, chop($xmldata))){
-      $msg = sprintf(_("XML error in gosa.conf: %s at line %d"),
+      $msg = sprintf(_("XML error in fusiondirectory.conf: %s at line %d"),
             xml_error_string(xml_get_error_code($this->parser)),
             xml_get_current_line_number($this->parser));
       msg_dialog::display(_("Configuration error"), $msg, FATAL_ERROR_DIALOG);
@@ -1084,7 +1084,7 @@ class config  {
    *
    *  This function checks if the configuration file version matches the
    *  version of the gosa version, by comparing it with the configuration
-   *  file version of the example gosa.conf that comes with GOsa.
+   *  file version of the example fusiondirectory.conf that comes with GOsa.
    *  If a version mismatch occurs an error is triggered.
    * */
   function check_config_version()
@@ -1097,7 +1097,7 @@ class config  {
      */
     session::global_set("LastChecked",$this->config_version);
 
-    $current = md5(file_get_contents(CONFIG_TEMPLATE_DIR."/gosa.conf"));
+    $current = md5(file_get_contents(CONFIG_TEMPLATE_DIR."/fusiondirectory.conf"));
 
     /* Check contributed config version and current config version.
      */
@@ -1112,7 +1112,7 @@ class config  {
    *  On debian systems the session files are deleted with
    *  a cronjob, which detects all files older than specified 
    *  in php.ini:'session.gc_maxlifetime' and removes them.
-   *  This function checks if the gosa.conf value matches the range
+   *  This function checks if the fusiondirectory.conf value matches the range
    *  defined by session.gc_maxlifetime.
    *
    *  \return boolean TRUE or FALSE depending on weither the settings match

include/class_plugin.inc

@@ -1204,7 +1204,7 @@ class plugin
   }
 
 
-  /*! \brief    Calls external hooks which are defined for this plugin (gosa.conf)
+  /*! \brief    Calls external hooks which are defined for this plugin (fusiondirectory.conf)
    *            Replaces placeholder by class values of this plugin instance.
    *  @param    Allows to a add special replacements.
    */
@@ -1416,7 +1416,7 @@ class plugin
       return;
     }
 
-    /* Get configuration from gosa.conf */
+    /* Get configuration from fusiondirectory.conf */
     $config = $this->config;
 
     /* Create lokal ldap connection */

include/class_userinfo.inc

@@ -719,7 +719,7 @@ class userinfo
   }
 
  
-  /*! \brief  Returns TRUE if the current user is configured in IGNORE_ACL=".." in your gosa.conf 
+  /*! \brief  Returns TRUE if the current user is configured in IGNORE_ACL=".." in your fusiondirectory.conf 
       @param  Return Boolean TRUE if we have to skip ACL checks else FALSE.
    */ 
   function ignore_acl_for_current_user()

include/functions.inc

@@ -35,10 +35,10 @@ if(!isset($_SERVER['CONFIG_DIR'])){
 }
 
 /* Allow setting the config file in the apache configuration
-    e.g.  SetEnv CONFIG_FILE gosa.conf.2.6
+    e.g.  SetEnv CONFIG_FILE fusiondirectory.conf.2.6
  */
 if(!isset($_SERVER['CONFIG_FILE'])){
-  define ("CONFIG_FILE", "gosa.conf");
+  define ("CONFIG_FILE", "fusiondirectory.conf");
 }else{
   define ("CONFIG_FILE",$_SERVER['CONFIG_FILE']);
 }
@@ -251,7 +251,7 @@ function get_browser_language()
     }
   }
 
-  /* Check for global language settings in gosa.conf */
+  /* Check for global language settings in fusiondirectory.conf */
   if (isset ($config) && $config->get_cfg_value('language') != ""){
     $lang = $config->get_cfg_value('language');
     if(!preg_match("/utf/i",$lang)){
@@ -2061,7 +2061,7 @@ function recurse($rule, $variables)
  *
  *  Unroll given rule string by filling in attributes.
  *
- * \param string 'rule' The rule string from gosa.conf.
+ * \param string 'rule' The rule string from fusiondirectory.conf.
  * \param array 'attributes' A dictionary of attribute/value mappings
  * \return string Expanded string, still containing the id keyword.
  */
@@ -2105,7 +2105,7 @@ function expand_id($rule, $attributes)
  *  Unroll given rule string by filling in attributes and replacing
  *  all keywords.
  *
- * \param string 'rule' The rule string from gosa.conf.
+ * \param string 'rule' The rule string from fusiondirectory.conf.
  * \param array 'attributes' A dictionary of attribute/value mappings
  * \return array List of valid not used uids
  */

include/utils/class_timezone.inc

@@ -39,14 +39,14 @@ class timezone {
       $stamp = time();
     }
 
-    /* Is there a timezone configured in the gosa configuration (gosa.conf) */
+    /* Is there a timezone configured in the fusiondirectory configuration (fusiondirectory.conf) */
     if ($config->get_cfg_value("timezone") != ""){
 
       /* Get zonename */
       $tz = $config->get_cfg_value("timezone");
 
       if(!@date_default_timezone_set($tz)){
-        msg_dialog::display(_("Configuration error"), sprintf(_("The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate correct timezone offset."), $tz), ERROR_DIALOG);
+        msg_dialog::display(_("Configuration error"), sprintf(_("The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate correct timezone offset."), $tz), ERROR_DIALOG);
       }
       $tz_delta = date("Z", $stamp);
       $tz_delta = $tz_delta / 3600 ;

locale/core/de/LC_MESSAGES/messages.po

@@ -759,10 +759,10 @@ msgstr "Die Sitzung ist nicht verschlüsselt!"
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
-"Die Konfiguration der Gültigkeitsdauer einer Sitzung in Ihrer gosa.conf wird "
+"Die Konfiguration der Gültigkeitsdauer einer Sitzung in Ihrer fusiondirectory.conf wird "
 "von der Einstellung in der php.ini überschrieben."
 
 #: html/index.php:165
@@ -1888,10 +1888,10 @@ msgstr "%s%% Trefferquote in Datei %s"
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
-"Die Einstellung '%s' der Zeitzone in Ihrer gosa.conf ist ungültig. Kann "
+"Die Einstellung '%s' der Zeitzone in Ihrer fusiondirectory.conf ist ungültig. Kann "
 "Zeitzonen-Versatz nicht berechnen."
 
 #: include/utils/class_xml.inc:48
@@ -2558,8 +2558,8 @@ msgstr "Kann Eintrag %s nicht entfernen!"
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "XML-Fehler in der Datei gosa.conf: %s in Zeile %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr "XML-Fehler in der Datei fusiondirectory.conf: %s in Zeile %d"
 
 #: include/class_config.inc:318
 msgid "Cannot bind to LDAP. Please contact the system administrator."

locale/core/es/LC_MESSAGES/messages.po

@@ -745,10 +745,10 @@ msgstr "¡La sesión no es codificada!"
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
-"El tiempo de vida de sesión es su gosa.conf sera sustituido por el valor de "
+"El tiempo de vida de sesión es su fusiondirectory.conf sera sustituido por el valor de "
 "ini de php."
 
 #: html/index.php:165
@@ -1882,10 +1882,10 @@ msgstr "%s%% procentaje en fichero %s"
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
-"El parámetro de zona horaria '%s' en gosa.conf no es válido. No se puede "
+"El parámetro de zona horaria '%s' en fusiondirectory.conf no es válido. No se puede "
 "calcular una compensación correcta para la zona horaria."
 
 #: include/utils/class_xml.inc:48
@@ -2548,8 +2548,8 @@ msgstr "¡No se puede eliminar la entrada %s!"
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "Error XML en gosa.conf: %s en la línea %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr "Error XML en fusiondirectory.conf: %s en la línea %d"
 
 #: include/class_config.inc:318
 msgid "Cannot bind to LDAP. Please contact the system administrator."

locale/core/fr/LC_MESSAGES/messages.po

@@ -750,10 +750,10 @@ msgstr "La session n'est pas cryptée !"
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
-"La durée de validité des sessions configurée dans votre gosa.conf sera "
+"La durée de validité des sessions configurée dans votre fusiondirectory.conf sera "
 "remplacée par celle définie dans votre php.ini."
 
 #: html/index.php:165
@@ -1891,10 +1891,10 @@ msgstr "%s%% de correspondance dans le fichier %s"
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
-"Le fuseau horaire '%s' indiqué dans votre gosa.conf est invalide. Impossible "
+"Le fuseau horaire '%s' indiqué dans votre fusiondirectory.conf est invalide. Impossible "
 "de calculer le décalage horaire correct."
 
 #: include/utils/class_xml.inc:48
@@ -2565,8 +2565,8 @@ msgstr "Impossible d'enlever l'entrée %s !"
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "Erreur XML dans gosa.conf: %s à la ligne %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr "Erreur XML dans fusiondirectory.conf: %s à la ligne %d"
 
 #: include/class_config.inc:318
 msgid "Cannot bind to LDAP. Please contact the system administrator."

locale/core/it/LC_MESSAGES/messages.po

@@ -621,7 +621,7 @@ msgstr "Terminal Server"
 #: html/password.php:58 html/index.php:144
 #, fuzzy, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
-msgstr "Il file di configurazione di GOsa %s/gosa.conf non è legibile."
+msgstr "Il file di configurazione di GOsa %s/fusiondirectory.conf non è legibile."
 
 #: html/password.php:74 html/index.php:144 html/index.php:216
 #: html/main.php:268
@@ -716,7 +716,7 @@ msgstr "Rilevato un conflitto di sessione"
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
 
@@ -1857,7 +1857,7 @@ msgstr ""
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
 
@@ -2538,7 +2538,7 @@ msgstr ""
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
 #: include/class_config.inc:318
@@ -5517,12 +5517,12 @@ msgstr "File di configurazione"
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
-msgstr "Il file di configurazione di GOsa %s/gosa.conf non è legibile."
+msgstr "Il file di configurazione di GOsa %s/fusiondirectory.conf non è legibile."
 
 #: setup/class_setupStep_Finish.inc:106
 #, fuzzy
 msgid "The configuration is currently not readable or it does not exists."
-msgstr "Il file di configurazione di GOsa %s/gosa.conf non è legibile."
+msgstr "Il file di configurazione di GOsa %s/fusiondirectory.conf non è legibile."
 
 #: setup/class_setupStep_Finish.inc:115
 #, fuzzy, php-format

locale/core/messages.po

@@ -683,7 +683,7 @@ msgstr ""
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
 
@@ -1751,7 +1751,7 @@ msgstr ""
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
 
@@ -2394,7 +2394,7 @@ msgstr ""
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
 #: include/class_config.inc:318

locale/core/nl/LC_MESSAGES/messages.po

@@ -656,7 +656,7 @@ msgstr "Terminal server"
 #: html/password.php:58 html/index.php:144
 #, fuzzy, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
-msgstr "GOsa configuratie %s/gosa.conf is niet leesbaar. Geannuleerd."
+msgstr "GOsa configuratie %s/fusiondirectory.conf is niet leesbaar. Geannuleerd."
 
 #: html/password.php:74 html/index.php:144 html/index.php:216
 #: html/main.php:268
@@ -754,7 +754,7 @@ msgstr "De sessie zal niet versleuteld zijn."
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
 
@@ -1415,7 +1415,7 @@ msgid ""
 "administrator!"
 msgstr ""
 "Kan de blokkade informatie niet ophalen uit de LDAP database. Controleer a.u."
-"b. de 'config' regel in gosa.conf!"
+"b. de 'config' regel in fusiondirectory.conf!"
 
 #: include/functions.inc:825
 #, fuzzy, php-format
@@ -1915,7 +1915,7 @@ msgstr "%s%% resultaat in bestand %s"
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
 
@@ -2611,8 +2611,8 @@ msgstr "Onbekende FAI status %s"
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "XML fout in gosa.conf: %s op regel %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr "XML fout in fusiondirectory.conf: %s op regel %d"
 
 #: include/class_config.inc:318
 #, fuzzy
@@ -5606,12 +5606,12 @@ msgstr "Configuratie bestand"
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
-msgstr "GOsa configuratie %s/gosa.conf is niet leesbaar. Geannuleerd."
+msgstr "GOsa configuratie %s/fusiondirectory.conf is niet leesbaar. Geannuleerd."
 
 #: setup/class_setupStep_Finish.inc:106
 #, fuzzy
 msgid "The configuration is currently not readable or it does not exists."
-msgstr "GOsa configuratie %s/gosa.conf is niet leesbaar. Geannuleerd."
+msgstr "GOsa configuratie %s/fusiondirectory.conf is niet leesbaar. Geannuleerd."
 
 #: setup/class_setupStep_Finish.inc:115
 #, fuzzy, php-format
@@ -8514,10 +8514,10 @@ msgstr "automatisch"
 
 #, fuzzy
 #~ msgid ""
-#~ "Setting for SMBHASH in gosa.conf is incorrect! Cannot change Samba "
+#~ "Setting for SMBHASH in fusiondirectory.conf is incorrect! Cannot change Samba "
 #~ "password."
 #~ msgstr ""
-#~ "De instelling voor 'SMBHASH' in gosa.conf is niet correct. Kan het samba "
+#~ "De instelling voor 'SMBHASH' in fusiondirectory.conf is niet correct. Kan het samba "
 #~ "wachtwoord niet veranderen."
 
 #, fuzzy

locale/core/pl/LC_MESSAGES/messages.po

@@ -630,7 +630,7 @@ msgstr "Błąd krytyczny"
 #: html/password.php:58 html/index.php:144
 #, fuzzy, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
-msgstr "Nie można czytać pliku konfiguracji %s/gosa.conf. Kończę."
+msgstr "Nie można czytać pliku konfiguracji %s/fusiondirectory.conf. Kończę."
 
 #: html/password.php:74 html/index.php:144 html/index.php:216
 #: html/main.php:268
@@ -722,7 +722,7 @@ msgstr "Sesja nie jest szyfrowana!"
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
 
@@ -984,7 +984,7 @@ msgid ""
 "set."
 msgstr ""
 "Funkcjonalność snapshot jest włączona, lecz wymagana zmienna '%s' nie jest "
-"skonfigurowana w gosa.conf."
+"skonfigurowana w fusiondirectory.conf."
 
 #: include/class_SnapshotHandler.inc:59 include/class_config.inc:1160
 #, fuzzy, php-format
@@ -993,7 +993,7 @@ msgid ""
 "is missing. Please install '%s'."
 msgstr ""
 "Funkcjonalność snapshot jest włączona, lecz wymagana zmienna '%s' nie jest "
-"skonfigurowana w gosa.conf."
+"skonfigurowana w fusiondirectory.conf."
 
 #: include/class_acl.inc:27
 msgid "Access control"
@@ -1362,7 +1362,7 @@ msgid ""
 "administrator!"
 msgstr ""
 "Nie można pobrać informacji o blokadach w bazie LDAP. Proszę sprawdzić wpis "
-"'config' w gosa.conf!"
+"'config' w fusiondirectory.conf!"
 
 #: include/functions.inc:825
 #, fuzzy, php-format
@@ -1846,7 +1846,7 @@ msgstr "%s%% trafień w pliku %s"
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
 
@@ -2527,8 +2527,8 @@ msgstr "Nieznany wpis  '%s'!"
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "Błąd XML w pliku gosa.conf: %s w linii %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr "Błąd XML w pliku fusiondirectory.conf: %s w linii %d"
 
 #: include/class_config.inc:318
 #, fuzzy
@@ -5440,12 +5440,12 @@ msgstr "Plik konfiguracyjny"
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
-msgstr "Nie można czytać pliku konfiguracji %s/gosa.conf. Kończę."
+msgstr "Nie można czytać pliku konfiguracji %s/fusiondirectory.conf. Kończę."
 
 #: setup/class_setupStep_Finish.inc:106
 #, fuzzy
 msgid "The configuration is currently not readable or it does not exists."
-msgstr "Nie można czytać pliku konfiguracji %s/gosa.conf. Kończę."
+msgstr "Nie można czytać pliku konfiguracji %s/fusiondirectory.conf. Kończę."
 
 #: setup/class_setupStep_Finish.inc:115
 #, fuzzy, php-format
@@ -8291,10 +8291,10 @@ msgstr "Automatycznie"
 
 #, fuzzy
 #~ msgid ""
-#~ "Setting for SMBHASH in gosa.conf is incorrect! Cannot change Samba "
+#~ "Setting for SMBHASH in fusiondirectory.conf is incorrect! Cannot change Samba "
 #~ "password."
 #~ msgstr ""
-#~ "Parametr SMBHASH w gosa.conf jest nieprawidłowy! Nie można zmienić hasła "
+#~ "Parametr SMBHASH w fusiondirectory.conf jest nieprawidłowy! Nie można zmienić hasła "
 #~ "Samba."
 
 #, fuzzy

locale/core/pt/LC_MESSAGES/messages.po

@@ -691,7 +691,7 @@ msgstr ""
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
 
@@ -1766,10 +1766,10 @@ msgstr ""
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
-"A configuração do fuso horário '%s' no gosa.conf não é válida. Não foi "
+"A configuração do fuso horário '%s' no fusiondirectory.conf não é válida. Não foi "
 "possível calcular o intervalo do fuso horário corretamente."
 
 #: include/utils/class_xml.inc:48
@@ -2421,8 +2421,8 @@ msgstr ""
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "Erro de XML no gosa.conf: %s na linha %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr "Erro de XML no fusiondirectory.conf: %s na linha %d"
 
 #: include/class_config.inc:318
 msgid "Cannot bind to LDAP. Please contact the system administrator."

locale/core/ru/LC_MESSAGES/messages.po

@@ -648,7 +648,7 @@ msgstr "Терминал-сервер"
 #, fuzzy, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr ""
-"Не удается прочитать файл настройки GOsa %s/gosa.conf. Операция прервана."
+"Не удается прочитать файл настройки GOsa %s/fusiondirectory.conf. Операция прервана."
 
 #: html/password.php:74 html/index.php:144 html/index.php:216
 #: html/main.php:268
@@ -742,7 +742,7 @@ msgstr "Данные, передаваемые в течение этого се
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
 
@@ -1413,7 +1413,7 @@ msgid ""
 "administrator!"
 msgstr ""
 "Не удается считать блокировку в базе данных LDAP. Проверьте, раздел \"config"
-"\" в файле gosa.conf!"
+"\" в файле fusiondirectory.conf!"
 
 #: include/functions.inc:825
 #, fuzzy, php-format
@@ -1897,7 +1897,7 @@ msgstr ""
 #: include/functions_helpviewer.inc:45
 #, fuzzy, php-format
 msgid "XML error in guide.xml: %s at line %d"
-msgstr "Ошибка XML в gosa.conf: %s в строке %d"
+msgstr "Ошибка XML в fusiondirectory.conf: %s в строке %d"
 
 #: include/functions_helpviewer.inc:88
 msgid "No help available for this plugin."
@@ -1916,7 +1916,7 @@ msgstr ""
 #: include/utils/class_timezone.inc:47
 #, php-format
 msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate "
 "correct timezone offset."
 msgstr ""
 
@@ -2604,8 +2604,8 @@ msgstr "состояние неизвестно"
 
 #: include/class_config.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "Ошибка XML в gosa.conf: %s в строке %d"
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr "Ошибка XML в fusiondirectory.conf: %s в строке %d"
 
 #: include/class_config.inc:318
 #, fuzzy
@@ -5641,13 +5641,13 @@ msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
 msgstr ""
-"Не удается прочитать файл настройки GOsa %s/gosa.conf. Операция прервана."
+"Не удается прочитать файл настройки GOsa %s/fusiondirectory.conf. Операция прервана."
 
 #: setup/class_setupStep_Finish.inc:106
 #, fuzzy
 msgid "The configuration is currently not readable or it does not exists."
 msgstr ""
-"Не удается прочитать файл настройки GOsa %s/gosa.conf. Операция прервана."
+"Не удается прочитать файл настройки GOsa %s/fusiondirectory.conf. Операция прервана."
 
 #: setup/class_setupStep_Finish.inc:115
 #, fuzzy, php-format
@@ -5657,7 +5657,7 @@ msgid ""
 "shouldn't. You may want to execute these commands to achieve this "
 "requirement:"
 msgstr ""
-"Поместив файл gosa.conf в каталог /etc/gosa, убедитесь, что только "
+"Поместив файл fusiondirectory.conf в каталог /etc/gosa, убедитесь, что только "
 "пользователь веб-сервера может его читать. Для этого вам, возможно, "
 "понадобится выполнить следующие команды:"
 
@@ -8457,10 +8457,10 @@ msgstr "автоматически"
 
 #, fuzzy
 #~ msgid ""
-#~ "Setting for SMBHASH in gosa.conf is incorrect! Cannot change Samba "
+#~ "Setting for SMBHASH in fusiondirectory.conf is incorrect! Cannot change Samba "
 #~ "password."
 #~ msgstr ""
-#~ "Параметр SMBHASH в gosa.conf некорректен! Не удается сменить пароль Samba."
+#~ "Параметр SMBHASH в fusiondirectory.conf некорректен! Не удается сменить пароль Samba."
 
 #, fuzzy
 #~ msgid "User delted"

locale/core/vi/LC_MESSAGES/messages.po

@@ -742,10 +742,10 @@ msgstr "Phiên không được mã hóa!"
 
 #: html/index.php:64
 msgid ""
-"The session lifetime configured in your gosa.conf will be overridden by php."
+"The session lifetime configured in your fusiondirectory.conf will be overridden by php."
 "ini settings."
 msgstr ""
-"Thời gian hạn định của phiên được cấu hình trong file gosa.conf của bạn sẽ "
+"Thời gian hạn định của phiên được cấu hình trong file fusiondirectory.conf của bạn sẽ "