From 2cd65e7edd7f5a7b0b7067a7f96201c22de3735f Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 2 May 2011 17:14:31 +0000 Subject: [PATCH] * 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 --- gosa-core/AUTHORS | 4 ++-- gosa-core/ihtml/themes/default/copyPasteDialog.tpl | 2 +- gosa-core/include/functions.inc | 8 ++++---- gosa-core/locale/core/fr/LC_MESSAGES/messages.po | 6 +++--- gosa-core/plugins/admin/ogroups/class_ogroup.inc | 2 +- gosa-core/plugins/admin/users/class_userManagement.inc | 2 +- gosa-core/setup/setup_feedback.tpl | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gosa-core/AUTHORS b/gosa-core/AUTHORS index e63cc853f..a8f969771 100644 --- a/gosa-core/AUTHORS +++ b/gosa-core/AUTHORS @@ -57,10 +57,10 @@ documentation and additional help. * Henning Schmiedehausen Various fixes, support for user defined people/group base -* Alfred Schröder +* Alfred Schröder German translation -* Thomas Schüßler +* Thomas Schüßler debuglib.inc is taken from him * Jan Wenzel diff --git a/gosa-core/ihtml/themes/default/copyPasteDialog.tpl b/gosa-core/ihtml/themes/default/copyPasteDialog.tpl index a43275e2a..0c6b1e3eb 100644 --- a/gosa-core/ihtml/themes/default/copyPasteDialog.tpl +++ b/gosa-core/ihtml/themes/default/copyPasteDialog.tpl @@ -4,7 +4,7 @@

{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}
{t}Remember that some properties like taken snapshots will not be copied!{/t}  {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 a126ff8d8..3b98e099a 100644 --- 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 ba1a48a9b..d0185d3ce 100644 --- 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 a51f0e630..54fa03b4c 100644 --- 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 f15817603..cf4faef32 100644 --- 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 453760c19..11f27f61d 100644 --- a/gosa-core/setup/setup_feedback.tpl +++ b/gosa-core/setup/setup_feedback.tpl @@ -2,7 +2,7 @@ {if $feedback_send}
- {t}Feedback sucessfully send{/t} + {t}Feedback successfully sent{/t}
{else} -- 2.30.2