* Fix french locale

* Recode stock old authors file to utf-8
* Backport some wording fixes from 2.7
* Remove samba2 leftovers from the setup

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

diff --git a/gosa-core/AUTHORS b/gosa-core/AUTHORS
index e63cc853fa14d1130bf8f1447356c84318b3ccc2..a8f9697717dde5a6778dcebb9dc7e4773ad35b4f 100644 (file)
--- a/gosa-core/AUTHORS
+++ b/gosa-core/AUTHORS
@@ -57,10 +57,10 @@ documentation and additional help.
 * Henning Schmiedehausen <hps@intermeta.de>
   Various fixes, support for user defined people/group base
 
-* Alfred Schröder <schroeder@gonicus.de>
+* Alfred Schröder <schroeder@gonicus.de>
   German translation
 
-* Thomas Schüßler <tulpe@atomar.de>
+* Thomas Schüßler <tulpe@atomar.de>
   debuglib.inc is taken from him
 
 * Jan Wenzel <jan.wenzel@gonicus.de>

diff --git a/gosa-core/ihtml/themes/default/copyPasteDialog.tpl b/gosa-core/ihtml/themes/default/copyPasteDialog.tpl
index a43275e2aba4d5c2862f1b1125275a865ffdb137..0c6b1e3eb02fa68f39fa06a211ff5ef56fd43ac6 100644 (file)
--- a/gosa-core/ihtml/themes/default/copyPasteDialog.tpl
+++ b/gosa-core/ihtml/themes/default/copyPasteDialog.tpl
@@ -4,7 +4,7 @@
 <br>
 <br>
 {if $Complete == false}
-       {t}Some values need to be unique in the complete directory while some combinations make no sense. GOsa shows the relevant attributes. Please maintain the values below to fullfill the policies.{/t}
+       {t}Some values need to be unique in the complete directory while some combinations make no sense. GOsa shows the relevant attributes. Please maintain the values below to fulfill the policies.{/t}
        <br>
 {t}Remember that some properties like taken snapshots will not be copied!{/t}&nbsp;
 {t}Or if you copy or cut an entry within GOsa and delete the source object, you may get errors while pasting this object again!{/t}

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index a126ff8d8d6970dfa52b2b63cf6536d8c9535da3..3b98e099ac921a58ae7311a2abd470f55811174a 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -2747,20 +2747,20 @@ function check_schema($cfg,$rfc2307bis = FALSE)
   /* The gosa base schema */
   $checks['gosaObject'] = $def_check;
   $checks['gosaObject']['REQUIRED_VERSION'] = "2.6.1";
-  $checks['gosaObject']['SCHEMA_FILES']     = array("gosa-samba3.schema","gosa-samba2.schema");
+  $checks['gosaObject']['SCHEMA_FILES']     = array("gosa-samba3.schema");
   $checks['gosaObject']['CLASSES_REQUIRED'] = array("gosaObject");
   $checks['gosaObject']['IS_MUST_HAVE']     = TRUE;
 
   /* GOsa Account class */
   $checks["gosaAccount"]["REQUIRED_VERSION"]= "2.6.6";
-  $checks["gosaAccount"]["SCHEMA_FILES"]    = array("gosa-samba3.schema","gosa-samba2.schema");
+  $checks["gosaAccount"]["SCHEMA_FILES"]    = array("gosa-samba3.schema");
   $checks["gosaAccount"]["CLASSES_REQUIRED"]= array("gosaAccount");
   $checks["gosaAccount"]["IS_MUST_HAVE"]    = TRUE;
   $checks["gosaAccount"]["INFO"]            = _("Used to store account specific informations.");
 
   /* GOsa lock entry, used to mark currently edited objects as 'in use' */
   $checks["gosaLockEntry"]["REQUIRED_VERSION"] = "2.6.1";
-  $checks["gosaLockEntry"]["SCHEMA_FILES"]     = array("gosa-samba3.schema","gosa-samba2.schema");
+  $checks["gosaLockEntry"]["SCHEMA_FILES"]     = array("gosa-samba3.schema");
   $checks["gosaLockEntry"]["CLASSES_REQUIRED"] = array("gosaLockEntry");
   $checks["gosaLockEntry"]["IS_MUST_HAVE"]     = TRUE;
   $checks["gosaLockEntry"]["INFO"]             = _("Used to lock currently edited entries to avoid multiple changes at the same time.");
@@ -2829,7 +2829,7 @@ function check_schema($cfg,$rfc2307bis = FALSE)
   /* The gosa base schema */
   $checks['posixGroup'] = $def_check;
   $checks['posixGroup']['REQUIRED_VERSION'] = "2.6.1";
-  $checks['posixGroup']['SCHEMA_FILES']     = array("gosa-samba3.schema","gosa-samba2.schema");
+  $checks['posixGroup']['SCHEMA_FILES']     = array("gosa-samba3.schema");
   $checks['posixGroup']['CLASSES_REQUIRED'] = array("posixGroup");
   $checks['posixGroup']['STATUS']           = TRUE;
   $checks['posixGroup']['IS_MUST_HAVE']     = TRUE;

diff --git a/gosa-core/locale/core/fr/LC_MESSAGES/messages.po b/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
index ba1a48a9b7d2025f0762a780fc63ae42468e8bb2..d0185d3ce77ae37be6cf15feb1e9e44a55a5baa8 100644 (file)
--- a/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
@@ -2227,15 +2227,15 @@ msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove "
 "the %s settings first!"
 msgstr ""
-"Ce compte possède %s paramètres activés. Pour le désactiver vous devez au "
-"préalable supprimer les %s paramètres !"
+"Ce compte possède les paramètres %s activés. Pour les désactiver vous devez au "
+"préalable supprimer les paramètres %s !"
 
 #: include/utils/class_msgPool.inc:405
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking below."
 msgstr ""
-"Ce compte possède %s paramètres desactivés. Vous pouvez les activer en "
+"Ce compte possède les paramètres %s desactivés. Vous pouvez les activer en "
 "clicquant ci dessous."
 
 #: include/utils/class_msgPool.inc:408 include/utils/class_msgPool.inc:415

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index a51f0e630027f8049361bca7d86d7c5ec0a8edfe..54fa03b4c4bb26a5fadacff3c350cb37aecfc44b 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -975,7 +975,7 @@ class ogroup extends plugin
             "cn"                => _("Name"),
             "base"              => _("Base"),
             "description"       => _("Description"),
-            "trustModel"        => _("Sytem trust"),
+            "trustModel"        => _("System trust"),
             "member"            => _("Member"))
           ));
   }

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index f15817603281d8ed9823003180d3b9f6383b5c57..cf4faef32cfe95dc67d4d0065fca77d89abe6f68 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -326,7 +326,7 @@ class userManagement extends management
                   return($smarty->fetch(get_template_path('password.tpl', TRUE)));
               }
 
-              // Change cassword
+              // Change password
               if(isset($this->force_hash_type[$this->dn])){
                   if(!change_password ($this->dn, $new_password,0,$this->force_hash_type[$this->dn])){
                       return($smarty->fetch(get_template_path('password.tpl', TRUE)));

diff --git a/gosa-core/setup/setup_feedback.tpl b/gosa-core/setup/setup_feedback.tpl
index 453760c19768662c72383bafe9c7226646e15526..11f27f61d6821e3e5bf15c471ba6c213f3ce8e97 100644 (file)
--- a/gosa-core/setup/setup_feedback.tpl
+++ b/gosa-core/setup/setup_feedback.tpl
@@ -2,7 +2,7 @@
 {if $feedback_send}
 
        <div class='default' style='margin:12px; '>  
-               <font color='green'>{t}Feedback sucessfully send{/t}</font>
+               <font color='green'>{t}Feedback successfully sent{/t}</font>
        </div>  
 
 {else}