From d4e3df1c9d58e0116294300fb219f9c1e337d00e Mon Sep 17 00:00:00 2001
From: kevin_fourie <kevin_fourie@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Tue, 12 Jun 2007 10:54:44 +0000
Subject: [PATCH] Merged in from STABLE trunk...

---
 i18n/knowledgeTree.pot                                      | 2 +-
 templates/ktcore/folder/permissions.smarty                  | 2 +-
 templates/ktcore/workflow/admin/allocate_permissions.smarty | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/i18n/knowledgeTree.pot b/i18n/knowledgeTree.pot
index 0013039..8678783 100644
--- a/i18n/knowledgeTree.pot
+++ b/i18n/knowledgeTree.pot
@@ -7154,7 +7154,7 @@ msgid "Select document types allowed in folder"
 msgstr ""
 
 #: i18n/templates.c:3797 i18n/templates.c:4268
-msgid "Select roles and groups for whom you wish to change permission assignement from the box on the left, and move them over to the box on the right using the button with right-pointing arrows. You can then allocate or remove permissions from these entities and save by pressing the 'Update Permission Assignments' button'."
+msgid "Select roles and groups for whom you wish to change permission assignment from the box on the left, and move them over to the box on the right using the button with right-pointing arrows. You can then allocate or remove permissions from these entities and save by pressing the 'Update Permission Assignments' button'."
 msgstr ""
 
 #: i18n/templates.c:3446
diff --git a/templates/ktcore/folder/permissions.smarty b/templates/ktcore/folder/permissions.smarty
index 2491e2d..e34b16f 100644
--- a/templates/ktcore/folder/permissions.smarty
+++ b/templates/ktcore/folder/permissions.smarty
@@ -32,7 +32,7 @@
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <div class="field">
   
-  <p class="descriptiveText">{i18n}Select roles and groups for whom you wish to change permission assignement from the box on the left, and move them over to the box on the right using the button with right-pointing arrows. You can then allocate or remove permissions from these entities and save by pressing the 'Update Permission Assignments' button'.{/i18n}</p>
+  <p class="descriptiveText">{i18n}Select roles and groups for whom you wish to change permission assignment from the box on the left, and move them over to the box on the right using the button with right-pointing arrows. You can then allocate or remove permissions from these entities and save by pressing the 'Update Permission Assignments' button'.{/i18n}</p>
       
 <table>
 
diff --git a/templates/ktcore/workflow/admin/allocate_permissions.smarty b/templates/ktcore/workflow/admin/allocate_permissions.smarty
index 81ab3ed..105f2b9 100644
--- a/templates/ktcore/workflow/admin/allocate_permissions.smarty
+++ b/templates/ktcore/workflow/admin/allocate_permissions.smarty
@@ -8,7 +8,7 @@
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <div class="field">
   
-  <p class="descriptiveText">{i18n}Select roles and groups for whom you wish to change permission assignement from the box on the left, and move them over to the box on the right using the button with right-pointing arrows. You can then allocate or remove permissions from these entities and save by pressing the 'Update Permission Assignments' button'.{/i18n}</p>
+  <p class="descriptiveText">{i18n}Select roles and groups for whom you wish to change permission assignment from the box on the left, and move them over to the box on the right using the button with right-pointing arrows. You can then allocate or remove permissions from these entities and save by pressing the 'Update Permission Assignments' button'.{/i18n}</p>
       
 <table>
 
--
libgit2 0.21.4