Updated texts

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

diff --git a/include/sieve/templates/add_element.tpl b/include/sieve/templates/add_element.tpl
index f007941b8718e322bcc832ccf325f3ec415835e7..d98c52986a7a3a447e4b445504b74e289a8443e3 100644 (file)
--- a/include/sieve/templates/add_element.tpl
+++ b/include/sieve/templates/add_element.tpl
@@ -8,7 +8,7 @@
 <p class='seperator'>&nbsp;</p>
 <br>
 <div class='seperator' style='text-align:right; width:100%;'>
+    <input type='submit' name='select_new_element_type' value='{t}Continue{/t}'>
+    &nbsp;
     <input type='submit' name='select_new_element_type_cancel' value='{t}Abort{/t}'>
-       &nbsp;
-       <input type='submit' name='select_new_element_type' value='{t}Next{/t}'>
 </div>

diff --git a/include/sieve/templates/element_address.tpl b/include/sieve/templates/element_address.tpl
index dfabd25629f941c3eac8733470fe32256f411d32..52bd1fae1ef01c16f3af1a01bb7af83cc0e79432 100755 (executable)
--- a/include/sieve/templates/element_address.tpl
+++ b/include/sieve/templates/element_address.tpl
@@ -14,7 +14,7 @@
                        <b>{t}Address{/t}</b>
                </td>
         <td style='text-align:right; vertical-align:top;'>
-                       <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal mode{/t}'>
+                       <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal view{/t}'>
                </td>
        </tr>
        <tr>
@@ -42,7 +42,7 @@
        </tr>
        <tr>
                <td>
-                       {t}Address part that should be used{/t}
+                       {t}Part of address that should be used{/t}
                </td>
                <td>
                        <select name='address_part_{$ID}' title='{t}Boolean value{/t}'> 
@@ -63,7 +63,7 @@
                {if $match_type == ":count" || $match_type == ":value"}
        <tr>
                <td>
-                       {t}operator{/t}
+                       {t}Operator{/t}
                </td>
                <td>
                        <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
@@ -125,7 +125,7 @@
                        <textarea style='width:100%;height:40px;' name='values_{$ID}'>{$values}</textarea>
                </td>
                <td style='text-align:right; vertical-align:top; width:120px;'>
-                       <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert mode{/t}'>
+                       <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert view{/t}'>
                </td>
        </tr>
        {/if}

diff --git a/include/sieve/templates/element_allof.tpl b/include/sieve/templates/element_allof.tpl
index 4107e58de9624355c676e01ec40452a6e7875dc3..024c011e7370f6109d2893f9027382904aa8a999 100644 (file)
--- a/include/sieve/templates/element_allof.tpl
+++ b/include/sieve/templates/element_allof.tpl
@@ -2,9 +2,9 @@
        <tr>
        <td class='sieve_allof_left'>
             {if $Inverse}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}'>
+                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}' title='{t}Inverse match{/t}'>
             {else}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}'>
+                <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}' title='{t}Inverse match{/t}'>
             {/if}
                        <br>
                        <b>{t}All of{/t}</b>

diff --git a/include/sieve/templates/element_anyof.tpl b/include/sieve/templates/element_anyof.tpl
index 1d90942946e16fc7fd743a94981685be0b53c10a..f7dc9298c73ce9379a58826103f974b8b49c1628 100644 (file)
--- a/include/sieve/templates/element_anyof.tpl
+++ b/include/sieve/templates/element_anyof.tpl
@@ -2,9 +2,9 @@
        <tr>
        <td class='sieve_anyof_left'>
             {if $Inverse}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}'>
+                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}' title='{t}Inverse match{/t}'>
             {else}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}'>
+                <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}' title='{t}Inverse match{/t}'>
             {/if}
                        <br>
                        <b>{t}Any of{/t}</b>

diff --git a/include/sieve/templates/element_comment.tpl b/include/sieve/templates/element_comment.tpl
index 5baf64e8e357a05a906ebb949fd82699ec0d574b..56edf9455db70a4bc8f1b81b61c3d896e0f83722 100644 (file)
--- a/include/sieve/templates/element_comment.tpl
+++ b/include/sieve/templates/element_comment.tpl
@@ -7,7 +7,7 @@
                        {if $Small}
                                <input type='submit' name='toggle_small_{$ID}' value='{t}Edit{/t}'>     
                        {else}
-                               <input type='submit' name='toggle_small_{$ID}' value='{t}Close{/t}'>    
+                               <input type='submit' name='toggle_small_{$ID}' value='{t}Cancel{/t}'>   
                        {/if}
                </td>
        </tr>

diff --git a/include/sieve/templates/element_discard.tpl b/include/sieve/templates/element_discard.tpl
index 55cfb82fc98f21c6c133119639fc13dcdedd858e..e26f77a3ad121cb68c00a92329a202339a680f61 100644 (file)
--- a/include/sieve/templates/element_discard.tpl
+++ b/include/sieve/templates/element_discard.tpl
@@ -6,7 +6,7 @@
        </tr>
        <tr>
                <td class='sieve_discard_input'>
-                       {t}Discard the message{/t}
+                       {t}Discard message{/t}
                </td>
        </tr>
 </table>

diff --git a/include/sieve/templates/element_elsif.tpl b/include/sieve/templates/element_elsif.tpl
index 4da7c47fc43354727fc6394f1dd2a694fd0b7be1..ffbbf9bbeccbdd4636a39d0ebf48df8edaf003a7 100644 (file)
--- a/include/sieve/templates/element_elsif.tpl
+++ b/include/sieve/templates/element_elsif.tpl
@@ -1,7 +1,7 @@
 <table class='sieve_default_table'>
        <tr>
                <td>
-                       <b>{t}Else If{/t}</b>
+                       <b>{t}Else if{/t}</b>
                        {$Contents}
        </td>
        </tr>

diff --git a/include/sieve/templates/element_envelope.tpl b/include/sieve/templates/element_envelope.tpl
index 7061b8a47b87e7b6b20685b8c1ae20e8f132f26a..c217d2dbbd24c08bbad337ae59c8978828291039 100755 (executable)
--- a/include/sieve/templates/element_envelope.tpl
+++ b/include/sieve/templates/element_envelope.tpl
@@ -15,7 +15,7 @@
                        <b>{t}Envelope{/t}</b>
                </td>
         <td style='text-align:right; vertical-align:top;'>
-            <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal mode{/t}'>
+            <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal view{/t}'>
         </td>
     </tr>
     <tr>
@@ -37,9 +37,9 @@
         </td>
         <td>
             {if $Inverse}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Yes{/t}'>
+                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Yes{/t}' title='{t}Inverse match{/t}'>
             {else}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}No{/t}'>
+                <input type='submit' name='toggle_inverse_{$ID}' value='{t}No{/t}' title='{t}Inverse match{/t}'>
             {/if}
         </td>
     </tr>
@@ -56,7 +56,7 @@
         {if $match_type == ":count" || $match_type == ":value"}
     <tr>
         <td>
-            {t}operator{/t}
+            {t}Operator{/t}
         </td>
         <td>
             <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
@@ -122,7 +122,7 @@
                        <textarea style='width:100%;height:40px;' name='values_{$ID}'>{$values}</textarea>
                </td>
                <td style='text-align:right; vertical-align:top; width:120px;'>
-                       <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert mode{/t}'>
+                       <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert view{/t}'>
                </td>
        </tr>
        {/if}

diff --git a/include/sieve/templates/element_exists.tpl b/include/sieve/templates/element_exists.tpl
index d78596b5ef1fe53021775308d47da6c6277fa443..29882d3f4a4600cf1facf335c02eadd0ecc6c425 100644 (file)
--- a/include/sieve/templates/element_exists.tpl
+++ b/include/sieve/templates/element_exists.tpl
@@ -7,9 +7,9 @@
             {/if}
             <b>{t}Exists{/t}</b>
             {if $Inverse}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}'>
+                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}' title='{t}Inverse match{/t}'>
             {else}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}'>
+                <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}' title='{t}Inverse match{/t}'>
             {/if}
 
                </td>

diff --git a/include/sieve/templates/element_header.tpl b/include/sieve/templates/element_header.tpl
index 7d04e4ad0b4c1fc599a68934068408235fde6ad1..6a8266c70d06a311bbd18209efd7ad3450e97367 100755 (executable)
--- a/include/sieve/templates/element_header.tpl
+++ b/include/sieve/templates/element_header.tpl
@@ -15,7 +15,7 @@
                        <b>{t}Header{/t}</b>
                </td>
         <td style='text-align:right; vertical-align:top;'>
-            <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal mode{/t}'>
+            <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal view{/t}'>
         </td>
     </tr>
     <tr>
@@ -121,7 +121,7 @@
             <textarea style='width:100%;height:40px;' name='values_{$ID}'>{$values}</textarea>
         </td>
         <td style='text-align:right; vertical-align:top; width:120px;'>
-            <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert mode{/t}'>
+            <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert view{/t}'>
         </td>
     </tr>
 

diff --git a/include/sieve/templates/element_keep.tpl b/include/sieve/templates/element_keep.tpl
index 067bcc6fee141aa1b446ef8eef454d97ad526b6b..f3c5d8608a63f9c21e6da2e000c2f5fd6f550396 100644 (file)
--- a/include/sieve/templates/element_keep.tpl
+++ b/include/sieve/templates/element_keep.tpl
@@ -6,7 +6,7 @@
        </tr>
        <tr>
                <td class='sieve_keep_input'>
-                       {t}Keep the message{/t}
+                       {t}Keep message{/t}
                </td>
        </tr>
 </table>

diff --git a/include/sieve/templates/element_size.tpl b/include/sieve/templates/element_size.tpl
index c07c020947b80734a3b8a61299a9deb7c44c0529..a8e2346939f2b45e220ea360f5bd6a959098727e 100644 (file)
--- a/include/sieve/templates/element_size.tpl
+++ b/include/sieve/templates/element_size.tpl
@@ -8,9 +8,9 @@
                        {/if}                   
 
                {if $Inverse}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}'>
+                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}' title='{t}Inverse match{/t}'>
             {else}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}'>
+                <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}' title='{t}Inverse match{/t}'>
             {/if}
 
                        <select name='Match_type_{$ID}' title='{t}Select match type{/t}'>

diff --git a/include/sieve/templates/element_stop.tpl b/include/sieve/templates/element_stop.tpl
index 60794b72d0d6b24435e8612dffe394f563d71d1c..975f10bdaadbc9e2021f38c30a0b28df5c726be6 100644 (file)
--- a/include/sieve/templates/element_stop.tpl
+++ b/include/sieve/templates/element_stop.tpl
@@ -6,7 +6,7 @@
        </tr>
        <tr>
                <td class='sieve_stop_input'>
-                       {t}Stop execution here!{/t}
+                       {t}Stop execution here{/t}
                </td>
        </tr>
 </table>

diff --git a/include/sieve/templates/element_vacation.tpl b/include/sieve/templates/element_vacation.tpl
index a361569b09c1ad8a3a3058dc10efc0e8750ae0f1..174148790c9aab56878c391850ea50add057a36d 100644 (file)
--- a/include/sieve/templates/element_vacation.tpl
+++ b/include/sieve/templates/element_vacation.tpl
@@ -13,7 +13,7 @@
                        <b>{t}Vacation Message{/t}</b>
                </td>   
         <td style='text-align:right; vertical-align:top;'>
-            <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal mode{/t}'>
+            <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal view{/t}'>
         </td>
        </tr>
        <tr>
@@ -41,10 +41,10 @@
        {else}
        <tr>
                <td>    
-                       <b>{t}Vacation Message{/t}</b>
+                       <b>{t}Vacation message{/t}</b>
                </td>   
                <td width='10%' style='vertical-align:top;'>
-            <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert mode{/t}'>
+            <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert view{/t}'>
                </td>
        </tr>
        <tr>

diff --git a/include/sieve/templates/management.tpl b/include/sieve/templates/management.tpl
index 53304ff7b1f3f9ef1dbe8f05d461abb756247048..315e47e0853a97b95c7dc043659a2a84ca7f2d14 100644 (file)
--- a/include/sieve/templates/management.tpl
+++ b/include/sieve/templates/management.tpl
@@ -21,7 +21,7 @@
        {$List}
        <input type='submit' name='create_new_script' value='{t}Create new script{/t}'>
        <p style="text-align:right;border-top:1px solid #999; padding-top:10px;">
-               <input type=submit name="sieve_finish" style="width:80px" value="{t}Ok{/t}">
+               <input type=submit name="sieve_finish" style="width:80px" value="{t}Save{/t}">
                &nbsp;
                <input type=submit name="sieve_cancel" value="{t}Cancel{/t}">
        </p>

diff --git a/include/sieve/templates/object_container.tpl b/include/sieve/templates/object_container.tpl
index ed75cd002d7395934c0cf628069964fdab8e83fd..3b5f51fa1a298e4326fa0c34f2a41e0bd08d1c33 100644 (file)
--- a/include/sieve/templates/object_container.tpl
+++ b/include/sieve/templates/object_container.tpl
@@ -5,16 +5,16 @@
                </td>
                <td class='object_container_cell_top_right'>
                        <input type='image' src='images/sieve_move_object_up.png' name='Move_Up_Object_{$ID}' 
-                               title='{t}Move this object one position up{/t}' alt='{t}Up{/t}' class='center'>
+                               title='{t}Move object up one position{/t}' alt='{t}Up{/t}' class='center'>
                        <a href='{$plug}&amp;Move_Up_Object_ID={$ID}'>{t}Move up{/t}</a>
                        &nbsp;&nbsp;&nbsp;
                        <input type='image' src='images/sieve_move_object_down.png' name='Move_Down_Object_{$ID}' 
-                               title='{t}Move this object one position down{/t}' alt='{t}Down{/t}' class='center'>
+                               title='{t}Move object down one position{/t}' alt='{t}Down{/t}' class='center'>
                        <a href='{$plug}&amp;Move_Down_Object_ID={$ID}'>{t}Move down{/t}</a>
                        &nbsp;&nbsp;&nbsp;
                        <input type='image' src='images/sieve_del_object.png' name='Remove_Object_{$ID}' 
-                               title='{t}Remove this object{/t}' alt='R' class='center'>
-                       <a href='{$plug}&amp;Remove_Object_ID={$ID}'>{t}Remove this element{/t}</a>
+                               title='{t}Remove object{/t}' alt='R' class='center'>
+                       <a href='{$plug}&amp;Remove_Object_ID={$ID}'>{t}Remove element{/t}</a>
                        &nbsp;&nbsp;&nbsp;
        
                        <select name='element_type_{$ID}'>
@@ -35,13 +35,13 @@
                        </select>
 
                        <input type='image' src='images/sieve_add_new_top.png' name='Add_Object_Top_{$ID}'
-                               alt='{t}Add new{/t}' title='{t}Add a new new object on top of this one.{/t}' class='center'>
+                               alt='{t}Add new{/t}' title='{t}Add a new new object above this one.{/t}' class='center'>
                        <input type='image' src='images/truly_not_available_image' name='Add_Object_Top_{$ID}'
-                               alt='{t}Add element above{/t}' title='{t}Add a new new object on top of this one.{/t}' class='center'>
+                               alt='{t}Add element above{/t}' title='{t}Add a new new object above this one.{/t}' class='center'>
                        <input type='image' src='images/sieve_add_new_bottom.png' name='Add_Object_Bottom_{$ID}'
-                               alt='{t}Add new{/t}' title='{t}Add a new new object at the bottom of this one.{/t}' class='center'>     
+                               alt='{t}Add new{/t}' title='{t}Add a new new object below this one.{/t}' class='center'>        
                        <input type='image' src='images/truly_not_available_image' name='Add_Object_Bottom_{$ID}'
-                               alt='{t}Add element below{/t}' title='{t}Add a new new object at the bottom of this one.{/t}' class='center'>   
+                               alt='{t}Add element below{/t}' title='{t}Add a new new object below this one.{/t}' class='center'>      
                </td>
        </tr>
        <tr>

diff --git a/include/sieve/templates/object_container_clear.tpl b/include/sieve/templates/object_container_clear.tpl
index a32427ca92e102e895c391ed994aedf89a18d5b7..4f5579fe554be94d9a6ba05114b6a5834063aeed 100644 (file)
--- a/include/sieve/templates/object_container_clear.tpl
+++ b/include/sieve/templates/object_container_clear.tpl
@@ -5,16 +5,16 @@
                </td>
                <td class='object_container_cell_top_right'>
                    <input type='image' src='images/sieve_move_object_up.png' name='Move_Up_Object_{$ID}'
-                title='{t}Move this object one position up{/t}' alt='{t}Up{/t}' class='center'>
+                title='{t}Move this object up one position{/t}' alt='{t}Up{/t}' class='center'>
             <a href='{$plug}&amp;Move_Up_Object_ID={$ID}'>{t}Move up{/t}</a>
 
             <input type='image' src='images/sieve_move_object_down.png' name='Move_Down_Object_{$ID}'
-                title='{t}Move this object one position down{/t}' alt='{t}Down{/t}' class='center'>
+                title='{t}Move this object down one position{/t}' alt='{t}Down{/t}' class='center'>
             <a href='{$plug}&amp;Move_Down_Object_ID={$ID}'>{t}Move down{/t}</a>
 
             <input type='image' src='images/sieve_del_object.png' name='Remove_Object_{$ID}'
                 title='{t}Remove this object{/t}' alt='R' class='center'>
-            <a href='{$plug}&amp;Remove_Object_ID={$ID}'>{t}Remove this element{/t}</a>
+            <a href='{$plug}&amp;Remove_Object_ID={$ID}'>{t}Remove element{/t}</a>
 
                </td>
     </tr>

diff --git a/include/sieve/templates/object_test_container.tpl b/include/sieve/templates/object_test_container.tpl
index 697d12d10943dc0616b8776f553703daab04a213..e1577177ab8e443618abf460535f2afd7923df1b 100644 (file)
--- a/include/sieve/templates/object_test_container.tpl
+++ b/include/sieve/templates/object_test_container.tpl
@@ -3,11 +3,11 @@
                <td style='width:20px; ; text-align:center; vertical-align:top;'>       
                        {if $DisplayAdd}
                                <input type='image' src='images/sieve_add_test.png' name='Add_Test_Object_{$ID}' 
-                                       title='{t}Add this object{/t}' alt='R' class='center'>
+                                       title='{t}Add object{/t}' alt='R' class='center'>
                        {/if}
                        {if $DisplayDel}
                                <input type='image' src='images/sieve_del_object.png' name='Remove_Test_Object_{$ID}' 
-                                       title='{t}Remove this object{/t}' alt='R' class='center'>
+                                       title='{t}Remove object{/t}' alt='R' class='center'>
                        {/if}
                </td>
                <td>

diff --git a/include/sieve/templates/select_test_type.tpl b/include/sieve/templates/select_test_type.tpl
index e08fea0e21ddea0e9b33bc75e49c0752296fc8b6..dd7a8fb2e8d4dc829bf574adfa61ee3fa0449e9a 100644 (file)
--- a/include/sieve/templates/select_test_type.tpl
+++ b/include/sieve/templates/select_test_type.tpl
@@ -1,4 +1,4 @@
-<h2>{t}Select the test type you want to add{/t}</h2>
+<h2>{t}Select the type of test you want to add{/t}</h2>
 
 <b>{t}Available test types{/t}</b>&nbsp;:&nbsp;
 <select name='test_type_to_add_{$ID}'>
@@ -8,7 +8,7 @@
 <p class='seperator'>&nbsp;</p>
 <br>
 <div class='seperator' style='text-align:right; width:100%;'>
-       <input type='submit' name='does_nothing' value='{t}Abort{/t}'>
+       <input type='submit' name='add_type' value='{t}Continue{/t}'>
        &nbsp;
-       <input type='submit' name='add_type' value='{t}Next{/t}'>
+       <input type='submit' name='does_nothing' value='{t}Cancel{/t}'>
 </div>