[pLog-svn] r697 - plog/trunk/templates/admin

oscar at devel.plogworld.net oscar at devel.plogworld.net
Sat Jan 8 22:55:45 GMT 2005


Author: oscar
Date: 2005-01-08 22:55:45 +0000 (Sat, 08 Jan 2005)
New Revision: 697

Removed:
   plog/trunk/templates/admin/resourcecenter.template
Modified:
   plog/trunk/templates/admin/blogsettings.template
   plog/trunk/templates/admin/blogtemplates.template
   plog/trunk/templates/admin/blogusers.template
   plog/trunk/templates/admin/customfields.template
   plog/trunk/templates/admin/editarticlecategory.template
   plog/trunk/templates/admin/editcomments.template
   plog/trunk/templates/admin/editcustomfield.template
   plog/trunk/templates/admin/editlinkcategories.template
   plog/trunk/templates/admin/editlinkcategory.template
   plog/trunk/templates/admin/editlinks.template
   plog/trunk/templates/admin/editpost.template
   plog/trunk/templates/admin/editposts.template
   plog/trunk/templates/admin/edittrackbacks.template
   plog/trunk/templates/admin/newcustomfield.template
   plog/trunk/templates/admin/newlink.template
   plog/trunk/templates/admin/newlinkcategory.template
   plog/trunk/templates/admin/newlocale.template
   plog/trunk/templates/admin/newpost.template
   plog/trunk/templates/admin/newpostcategory.template
   plog/trunk/templates/admin/newresource.template
   plog/trunk/templates/admin/newresourcealbum.template
   plog/trunk/templates/admin/poststats.template
   plog/trunk/templates/admin/resourcealbums.template
   plog/trunk/templates/admin/resources.template
   plog/trunk/templates/admin/siteblogs.template
   plog/trunk/templates/admin/sitelocales.template
   plog/trunk/templates/admin/sitetemplates.template
   plog/trunk/templates/admin/siteusers.template
   plog/trunk/templates/admin/statistics.template
   plog/trunk/templates/admin/userprofile.template
Log:
cleaned up most of the locale ids, so that they follow more or less a standard naming scheme (like 'xxxx_help' for the field descriptions in forms), etc, and also so that we can reuse as many strings as possible (therefore making the locale file even smaller!)

Modified: plog/trunk/templates/admin/blogsettings.template
===================================================================
--- plog/trunk/templates/admin/blogsettings.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/blogsettings.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -14,14 +14,14 @@
     <div class="field">
       <label for="blogLink">{$locale->tr("blog_link")}</label>
       <span class="required"></span>
-      <div class="formHelp">{$locale->tr("permanent_blog_url")}</div>
+      <div class="formHelp">{$locale->tr("blog_link_help")}</div>
       <input class="readOnly" type="text" readonly="readonly" id="blogLink" name="blogLink" value="{$url->blogLink()}" />
     </div>
 
     <div class="field">
       <label for="blogName">{$locale->tr("blog_name")}</label>
       <span class="required">*</span>
-      <div class="formHelp">{$locale->tr("blog_name")}</div>
+      <div class="formHelp">{$locale->tr("blog_name_help")}</div>
       <input type="text" name="blogName" id="blogName" style="width:100%" value="{$blogName}" />
       {include file="$admintemplatepath/validate.template" field=blogName message=$locale->tr("error_no_blog_name")}
     </div>
@@ -29,14 +29,14 @@
     <div class="field">
       <label for="blogAbout">{$locale->tr("long_blog_name")}</label>
       <span class="required"></span>
-      <div class="formHelp">{$locale->tr("long_blog_name")}</div>
+      <div class="formHelp">{$locale->tr("long_blog_name_help")}</div>
       <textarea rows="10" style="width:100%" id="blogAbout" name="blogAbout">{$blogAbout}</textarea>
     </div>
 
     <div class="field">
      <label for="blogLocale">{$locale->tr("language")}</label>
      <span class="required">*</span>
-     <div class="formHelp">{$locale->tr("language_used")}</div>
+     <div class="formHelp">{$locale->tr("blog_language_help")}</div>
      <select name="blogLocale" id="blogLocale">
       {foreach from=$locales item=localeobject}
        <option value="{$localeobject->getLocaleCode()}" {if $localeobject->getLocaleCode()==$blogLocale} selected="selected" {/if}>
@@ -50,7 +50,7 @@
     <div class="field">
      <label for="blogMaxMainPageItems">{$locale->tr("max_main_page_items")}</label>
      <span class="required">*</span>
-     <div class="formHelp">{$locale->tr("items_main_page")}</div>
+     <div class="formHelp">{$locale->tr("max_main_page_items_help")}</div>
      <input type="text" name="blogMaxMainPageItems" id="blogMaxMainPageItems" value="{$blogMaxMainPageItems}"/>
      {include file="$admintemplatepath/validate.template" field=blogMaxMainPageItems message=$locale->tr("error_incorrect_number_of_posts")}
     </div>
@@ -58,7 +58,7 @@
     <div class="field">
      <label for="blogMaxRecentItems">{$locale->tr("max_recent_items")}</label>
      <span class="required">*</span>
-     <div class="formHelp">{$locale->tr("items_as_recent")}</div>
+     <div class="formHelp">{$locale->tr("max_recent_items_help")}</div>
      <input type="text" name="blogMaxRecentItems" id="blogMaxRecentItems" value="{$blogMaxRecentItems}" />
      {include file="$admintemplatepath/validate.template" field=blogMaxRecentItems message=$locale->tr("error_incorrect_max_recent_items")}
     </div>
@@ -66,7 +66,7 @@
     <div class="field">
      <label for="blogTemplate">{$locale->tr("template")}</label>
      <span class="required">*</span>
-     <div class="formHelp">{$locale->tr("template_used")}</div>
+     <div class="formHelp">{$locale->tr("blog_template_help")}</div>
     {assign var=blogTemplateSet value=$blog->getTemplateSet()}
      <select name="blogTemplate" id="blogTemplate">
        {foreach from=$templates item=template}
@@ -81,7 +81,7 @@
       <label for="blogShowMoreEnabled">{$locale->tr("use_read_more")}</label>
       <div class="formHelp">
 	    <input class="checkbox" type="checkbox" value="1" name="blogShowMoreEnabled" id="blogShowMoreEnabled" {if $blogShowMoreEnabled == true} checked="checked" {/if} />
-	    {$locale->tr("use_read_more_feature")}
+	    {$locale->tr("use_read_more_help")}
       </div> 
      </div>
 
@@ -89,7 +89,7 @@
       <label for="blogEnableHtmlArea">{$locale->tr("enable_wysiwyg")}</label>
       <div class="formHelp">
 	    <input class="checkbox" type="checkbox" id="blogEnableHtmlarea" name="blogEnableHtmlarea" value="1" {if $blogEnableHtmlarea == true} checked="checked" {/if} />
-	    {$locale->tr("enable_wysiwyg_edition")}
+	    {$locale->tr("enable_wysiwyg_help")}
       </div>
      </div>
 
@@ -100,7 +100,7 @@
       <label for="blogCommentsEnabled">{$locale->tr("enable_comments")}</td>
       <div class="formHelp">
 	    <input class="checkbox" type="checkbox" name="blogCommentsEnabled" id="blogCommentsEnabled" value="1" {if $blogCommentsEnabled == true} checked="checked" {/if} />
-	    {$locale->tr("enable_comments")}
+	    {$locale->tr("enable_comments_help")}
       </div>  
      </div>
 
@@ -108,13 +108,13 @@
       <label for="blogShowFuturePosts">{$locale->tr("show_future_posts")}</label>
       <div class="formHelp">
         <input class="checkbox" type="checkbox" name="blogShowFuturePosts" id="blogShowFuturePosts" value="1" {if $blogShowFuturePosts == true} checked="checked" {/if} />	  
-	    {$locale->tr("show_future_posts")}
+	    {$locale->tr("show_future_posts_help")}
 	  </div>
     </div>
 
     <div class="field">
      <label for="blogCommentsOrder">{$locale->tr("comments_order")}</label>
-     <div class="formHelp">{$locale->tr("comments_order")}</div>
+     <div class="formHelp">{$locale->tr("comments_order_help")}</div>
      <select name="blogCommentsOrder" id="blogCommentsOrder">
        <option value="1" {if $blogCommentsOrder == 1 } selected="selected" {/if}>{$locale->tr("oldest_first")}</option>
        <option value="2" {if $blogCommentsOrder == 2 } selected="selected" {/if}>{$locale->tr("newest_first")}</option>
@@ -123,7 +123,7 @@
 
     <div class="field">
      <label for="blogCategoriesOrder">{$locale->tr("categories_order")}</label>
-     <div class="formHelp">{$locale->tr("categories_order")}</div>
+     <div class="formHelp">{$locale->tr("categories_order_help")}</div>
      <select name="blogCategoriesOrder" id="blogCategoriesOrder">
        <option value="1" {if $blogCategoriesOrder == 1 } selected="selected" {/if}>{$locale->tr("most_recent_updated_first")}</option>	  
        <option value="2" {if $blogCategoriesOrder == 2 } selected="selected" {/if}>{$locale->tr("oldest_first")}</option>
@@ -136,7 +136,7 @@
 
     <div class="field">
      <label for="blogLinkCategoriesOrder">{$locale->tr("link_categories_order")}</label>
-     <div class="formHelp">{$locale->tr("link_categories_order")}</div>
+     <div class="formHelp">{$locale->tr("link_categories_order_help")}</div>
      <select name="blogLinkCategoriesOrder" id="blogLinkCategoriesOrder">
        <option value="1" {if $blogLinkCategoriesOrder == 1 } selected="selected" {/if}>{$locale->tr("alphabetical_order")}</option>
        <option value="2" {if $blogLinkCategoriesOrder == 2 } selected="selected" {/if}>{$locale->tr("reverse_alphabetical_order")}</option>
@@ -148,7 +148,7 @@
 
     <div class="field">
      <label for="blogTimeOffset">{$locale->tr("time_offset")}</label>
-     <div class="formHelp">{$locale->tr("time_offset")}</div>
+     <div class="formHelp">{$locale->tr("time_offset_help")}</div>
       <select name="blogTimeOffset" id="blogTimeOffset">
        <option {if $blogTimeOffset == -20} selected="selected"{/if} value="-20">-20 {$locale->tr("hours")}</option>
        <option {if $blogTimeOffset == -19} selected="selected"{/if} value="-19">-19 {$locale->tr("hours")}</option>

Modified: plog/trunk/templates/admin/blogtemplates.template
===================================================================
--- plog/trunk/templates/admin/blogtemplates.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/blogtemplates.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -39,7 +39,7 @@
      <div class="list_action_button">
       <a href="?op=deleteBlogTemplate&amp;templateId={$sitetemplate->getName()}">
        {if $blogTemplate->getName() != $sitetemplate->getName()}
-	     <img src="imgs/icon_delete-16.png" alt="{$locale->tr("delete_selected")}" />
+	     <img src="imgs/icon_delete-16.png" alt="{$locale->tr("delete")}" />
 	   {/if}  
       </a>
 	  {if $sitetemplate->hasScreenshot()}
@@ -56,7 +56,7 @@
  </div>
  <div id="list_action_bar">
    <input type="hidden" name="op" value="deleteBlogTemplates" class="submit" />
-   <input type="submit" name="{$locale->tr("delete_selected")}" value="{$locale->tr("delete_selected")}"/>
+   <input type="submit" name="{$locale->tr("delete")}" value="{$locale->tr("delete")}"/>
  </div>
  </form>
 {include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/admin/blogusers.template
===================================================================
--- plog/trunk/templates/admin/blogusers.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/blogusers.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -53,7 +53,7 @@
             </table>
         </div>
         <div id="list_action_bar">
-            <input type="submit" name="delete_selected" value="{$locale->tr("revoke_permissions")}" class="submit" />
+            <input type="submit" name="delete" value="{$locale->tr("revoke_permissions")}" class="submit" />
             <input type="hidden" name="op" value="deleteBlogUsersPermissions" />
         </div>
 	</form>

Modified: plog/trunk/templates/admin/customfields.template
===================================================================
--- plog/trunk/templates/admin/customfields.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/customfields.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -56,7 +56,7 @@
         </div>
         <div id="list_action_bar">
 	    {include file="$admintemplatepath/adminpager.template" style=list}
-            <input type="submit" name="delete_selected" value="{$locale->tr("delete_selected")}" class="submit" />
+            <input type="submit" name="delete" value="{$locale->tr("delete")}" class="submit" />
             <input type="hidden" name="op" value="deleteCustomFields" />
         </div>
 </form>

Modified: plog/trunk/templates/admin/editarticlecategory.template
===================================================================
--- plog/trunk/templates/admin/editarticlecategory.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/editarticlecategory.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -10,7 +10,7 @@
    <div class="field">
     <label for="categoryName">{$locale->tr("name")}</label>
     <span class="required">*</span>
-    <div class="formHelp">{$locale->tr("category_name_info")}</div>
+    <div class="formHelp">{$locale->tr("category_name_help")}</div>
     <input type="text" id="categoryName" name="categoryName" value="{$categoryName|escape:"html"}"/>
     {include file="$admintemplatepath/validate.template" field=categoryName message=$locale->tr("error_empty_category_name")}
    </div>
@@ -28,7 +28,7 @@
     <span class="required"></span>
     <div class="formHelp">
       <input class="checkbox" type="checkbox" value="1" id="categoryInMainPage" name="categoryInMainPage" {if $categoryInMainPage}checked="checked"{/if}/>	
-	  {$locale->tr("show_in_main_page_info")}
+	  {$locale->tr("show_in_main_page_help")}
 	</div>  
    </div>
   </fieldset>

Modified: plog/trunk/templates/admin/editcomments.template
===================================================================
--- plog/trunk/templates/admin/editcomments.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/editcomments.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -106,7 +106,7 @@
 
         <div id="list_action_bar">
 	    {include file="$admintemplatepath/adminpager.template" style=list}
-            <input type="submit" name="delete_selected" value="{$locale->tr("delete_selected")}" class="submit" />
+            <input type="submit" name="delete" value="{$locale->tr("delete")}" class="submit" />
 			<input type="hidden" name="articleId" value="{$post->getId()}" />
             <input type="hidden" name="op" value="deleteComments" />
         </div>

Modified: plog/trunk/templates/admin/editcustomfield.template
===================================================================
--- plog/trunk/templates/admin/editcustomfield.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/editcustomfield.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -48,7 +48,7 @@
     <input type="hidden" name="op" value="updateCustomField" />
     <input type="hidden" name="fieldId" value="{$fieldId}" />
     <input type="reset" name="Rest" value="{$locale->tr("reset")}" />	
-    <input type="submit" name="{$locale->tr("update_field")}" value="{$locale->tr("update_field")}" />
+    <input type="submit" name="{$locale->tr("update")}" value="{$locale->tr("update")}" />
   </div> 	
  </form>
 

Modified: plog/trunk/templates/admin/editlinkcategories.template
===================================================================
--- plog/trunk/templates/admin/editlinkcategories.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/editlinkcategories.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -46,7 +46,7 @@
  <div id="list_action_bar">
   {include file="$admintemplatepath/adminpager.template" style=list}
   <input type="hidden" name="op" value="deleteLinkCategories"/>
-  <input type="submit" name="Delete selected" value="{$locale->tr("delete_selected")}"/>
+  <input type="submit" name="Delete selected" value="{$locale->tr("delete")}"/>
  </div> 
  </form>
 

Modified: plog/trunk/templates/admin/editlinkcategory.template
===================================================================
--- plog/trunk/templates/admin/editlinkcategory.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/editlinkcategory.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -7,7 +7,7 @@
    <div class="field">
      <label for="linkCategoryName">{$locale->tr("name")}</label>
      <span class="required">*</span>
-     <div class="formHelp">{$locale->tr("link_category_name_info")}</div>
+     <div class="formHelp">{$locale->tr("link_category_name_help")}</div>
      <input type="text" id="linkCategoryName" name="linkCategoryName" value="{$linkCategoryName|escape:"html"}"/>
      {include file="$admintemplatepath/validate.template" field=linkUrl message=$locale->tr("error_provide_link_category_name")}     
    </div>

Modified: plog/trunk/templates/admin/editlinks.template
===================================================================
--- plog/trunk/templates/admin/editlinks.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/editlinks.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -6,7 +6,7 @@
  <fieldset>
   <legend>{$locale->tr("show_links_by")}</legend>
    <div class="list_nav_option">
-    <label for="showCategory">{$locale->tr("link_category")}</label>
+    <label for="showCategory">{$locale->tr("category")}</label>
 	<br />
 	 <select name="showCategory" id="showCategory">
       <option value="0">{$locale->tr("category_all")}</option>
@@ -38,9 +38,9 @@
  <thead>
   <tr>
    <th style="width:10px;"><input class="checkbox" type="checkbox" class="check" name="all" id="all" value="1" onclick="toggleAllChecks('links');" /></th>  
-   <th style="width:300px;">{$locale->tr("link_name")}</th>
-   <th style="widht:200px";>{$locale->tr("link_url")}</th>
-   <th style="width:120px">{$locale->tr("link_category")}</th>
+   <th style="width:300px;">{$locale->tr("name")}</th>
+   <th style="widht:200px";>{$locale->tr("url")}</th>
+   <th style="width:120px">{$locale->tr("category")}</th>
    <th style="width:50px";>{$locale->tr("feed")}</th>
    <th style="width:95px";>{$locale->tr("actions")}</th>
   </tr>
@@ -76,7 +76,7 @@
  <div id="list_action_bar">
   {include file="$admintemplatepath/adminpager.template" style=list}
   <input type="hidden" name="op" value="deleteLinks"/>
-  <input type="submit" name="Delete selected" value="{$locale->tr("delete_selected")}"/>
+  <input type="submit" name="Delete selected" value="{$locale->tr("delete")}"/>
  </div>
 </form>
 

Modified: plog/trunk/templates/admin/editpost.template
===================================================================
--- plog/trunk/templates/admin/editpost.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/editpost.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -106,23 +106,23 @@
 	      
        <div class="field_checkbox">
          <input class="checkbox" type="checkbox" id="commentsEnabled" name="commentsEnabled" value="1" {if $commentsEnabled} checked="checked" {/if}/>
-		 <label for="commentsEnabled">{$locale->tr("enable_comments_for_post")}</label>
+		 <label for="commentsEnabled">{$locale->tr("post_comments_enabled_help")}</label>
 	   </div>
 	   
        <div class="field_checkbox">
 	     <input class="checkbox" type="checkbox" id="sendNotification" name="sendNotification" value="1" {if $sendNotification} checked="checked" {/if}/>
-		 <label for="sendNotification">{$locale->tr("send_notification")}</label>
+		 <label for="sendNotification">{$locale->tr("send_notification_help")}</label>
 	   </div>
 	   
        <div class="field_checkbox">
 	     <input class="checkbox" type="checkbox" id="sendTrackbacks" name="sendTrackbacks" value="1" {if $sendTrackbacks} checked="checked" {/if}/>  
-		 <label for="sendTrackbacks">{$locale->tr("send_trackback_pings")}</label>
+		 <label for="sendTrackbacks">{$locale->tr("send_trackback_pings_help")}</label>
 	   </div>
 	   
 	   <div class="field_checkbox">	
          {if $xmlRpcPingEnabled}
 		 <input class="checkbox" type="checkbox" name="sendPings" id="sendPings" value="1" {if $sendPings} checked="checked" {/if}/>
-		 <label for="sendPings">{$locale->tr("send_xmlrpc_pings")}</label>
+		 <label for="sendPings">{$locale->tr("send_xmlrpc_pings_help")}</label>
 		 {/if}
       </div>
 	  

Modified: plog/trunk/templates/admin/editposts.template
===================================================================
--- plog/trunk/templates/admin/editposts.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/editposts.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -146,7 +146,7 @@
         </div>
         <div id="list_action_bar">
             {include file="$admintemplatepath/adminpager.template" style=list}
-            <input type="submit" name="delete_selected" value="{$locale->tr("delete_selected")}" class="submit" />
+            <input type="submit" name="delete" value="{$locale->tr("delete")}" class="submit" />
             <input type="hidden" name="op" value="deletePosts" />
         </div>
 

Modified: plog/trunk/templates/admin/edittrackbacks.template
===================================================================
--- plog/trunk/templates/admin/edittrackbacks.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/edittrackbacks.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -53,7 +53,7 @@
         </div>
         <div id="list_action_bar">
             {include file="$admintemplatepath/adminpager.template" style=list}
-            <input type="submit" name="delete_selected" value="{$locale->tr("delete_selected")}" class="submit" />
+            <input type="submit" name="delete" value="{$locale->tr("delete")}" class="submit" />
 			<input type="hidden" name="articleId" value="{$post->getId()}" />
             <input type="hidden" name="op" value="deleteTrackbacks" />
         </div>

Modified: plog/trunk/templates/admin/newcustomfield.template
===================================================================
--- plog/trunk/templates/admin/newcustomfield.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/newcustomfield.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -47,7 +47,7 @@
     <input type="hidden" name="fieldSearchable" value="1" />
     <input type="hidden" name="op" value="addCustomField" />
     <input type="reset" name="Rest" value="{$locale->tr("reset")}" />
-    <input type="submit" name="{$locale->tr("add_field")}" value="{$locale->tr("add_field")}" />
+    <input type="submit" name="{$locale->tr("add")}" value="{$locale->tr("add")}" />
   </div>  
  </form>
  

Modified: plog/trunk/templates/admin/newlink.template
===================================================================
--- plog/trunk/templates/admin/newlink.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/newlink.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -54,7 +54,7 @@
         <div class="buttons">
 		    <input type="hidden" name="op" value="addLink" />
             <input type="reset" value="{$locale->tr("reset")}" name="reset"/>		    
-			<input type="submit" name="Add" value="{$locale->tr("add_link")}"/>
+			<input type="submit" name="Add" value="{$locale->tr("add")}"/>
             <input type="hidden" value="addLink" name="op"/>
         </div> 
  

Modified: plog/trunk/templates/admin/newlinkcategory.template
===================================================================
--- plog/trunk/templates/admin/newlinkcategory.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/newlinkcategory.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -7,7 +7,7 @@
    <div class="field">
      <label for="linkCategoryName">{$locale->tr("name")}</label>
      <span class="required">*</span>
-     <div class="formHelp">{$locale->tr("link_category_name_info")}</div>
+     <div class="formHelp">{$locale->tr("link_category_name_help")}</div>
      <input type="text" id="linkCategoryName" name="linkCategoryName" value="{$linkCategoryName}"/>
      {include file="$admintemplatepath/validate.template" field=linkUrl message=$locale->tr("error_provide_link_category_name")}     
    </div>
@@ -15,7 +15,7 @@
   <div class="buttons">
     <input type="reset" value="{$locale->tr("reset")}" name="reset"/>  
     <input type="hidden" name="op" value="addLinkCategory"/>
-    <input type="submit" name="Add" value="{$locale->tr("add_link_category")}"/>
+    <input type="submit" name="Add" value="{$locale->tr("add")}"/>
   </div>  
  </form>
 {include file="$admintemplatepath/footer.template"}

Modified: plog/trunk/templates/admin/newlocale.template
===================================================================
--- plog/trunk/templates/admin/newlocale.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/newlocale.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -21,7 +21,6 @@
   {$locale->tr("use_this_form_if_cant_upload_locale")}
  </p>
  <form name="addLocaleCode" action="admin.php" method="post">
-  <!--{$locale->tr("locale_code")}: <input type="text" name="localeCode" value="" size="4" /><br />-->
   <input type="hidden" name="op" value="scanLocales" />
   <input type="submit" name="Add Locale" value="{$locale->tr("scan_locales")}" />
  </form>

Modified: plog/trunk/templates/admin/newpost.template
===================================================================
--- plog/trunk/templates/admin/newpost.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/newpost.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -130,23 +130,23 @@
    
        <div class="field_checkbox">
          <input class="checkbox" type="checkbox" id="commentsEnabled" name="commentsEnabled" value="1" {if $commentsEnabled} checked="checked" {/if}/>
-		 <label for="commentsEnabled">{$locale->tr("enable_comments_for_post")}</label>
+		 <label for="commentsEnabled">{$locale->tr("post_comments_enabled_help")}</label>
 	   </div>
    
        <div class="field_checkbox">
 	     <input class="checkbox" type="checkbox" name="sendNotification" id="sendNotification" value="1" {if $sendNotification} checked="checked" {/if}/>
-		 <label for="sendNotification">{$locale->tr("send_notification")}</label>
+		 <label for="sendNotification">{$locale->tr("send_notification_help")}</label>
 	   </div>
 
        <div class="field_checkbox">
 	     <input class="checkbox" type="checkbox" name="sendTrackbacks" id="sendTrackbacks" value="1" {if $sendTrackbacks} checked="checked" {/if}/>  
-		 <label for="sendTrackbacks">{$locale->tr("send_trackback_pings")}</label>
+		 <label for="sendTrackbacks">{$locale->tr("send_trackback_pings_help")}</label>
 	   </div>
         
 	   <div class="field_checkbox">	
          {if $xmlRpcPingEnabled}
 		 <input class="checkbox" type="checkbox" name="sendPings" id="sendPings" value="1" {if $sendPings} checked="checked" {/if}/>
-		 <label for="sendPings">{$locale->tr("send_xmlrpc_pings")}</label>
+		 <label for="sendPings">{$locale->tr("send_xmlrpc_pings_help")}</label>
 		 {/if}
       </div>
 	  

Modified: plog/trunk/templates/admin/newpostcategory.template
===================================================================
--- plog/trunk/templates/admin/newpostcategory.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/newpostcategory.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -9,7 +9,7 @@
    <div class="field">
     <label for="categoryName">{$locale->tr("category_name")}</label>
     <span class="required">*</span>
-    <div class="formHelp">{$locale->tr("add_new_category_info")}</div>
+    <div class="formHelp">{$locale->tr("category_name_help")}</div>
     <input type="text" value="{$categoryName}" id="categoryName" name="categoryName" />
     {include file="$admintemplatepath/validate.template" field=categoryName message=$locale->tr("error_empty_category_name")}
    </div>
@@ -17,6 +17,7 @@
    <div class="field">
     <label for="categoryDescription">{$locale->tr("description")}</label>
     <span class="required">*</span>
+    <div class="formHelp">{$locale->tr("category_description_help")}</div>	
     <br/><textarea name="categoryDescription" cols="60" id="categoryDescription" rows="5">{$categoryDescription}</textarea>
     {include file="$admintemplatepath/validate.template" field=categoryDescription message=$locale->tr("error_empty_category_description")}  
    </div>
@@ -26,7 +27,7 @@
     <span class="required"></span>
     <div class="formHelp">
       <input class="checkbox" type="checkbox" value="1" name="categoryInMainPage" id="categoryInMainPage" {if $categoryInMainPage}checked="checked"{/if}/>	
-	  {$locale->tr("show_in_main_page_info")}
+	  {$locale->tr("show_in_main_page_help")}
 	</div>  
    </div>
    

Modified: plog/trunk/templates/admin/newresource.template
===================================================================
--- plog/trunk/templates/admin/newresource.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/newresource.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -33,7 +33,7 @@
   <div class="field">
     <label for="albumId">{$locale->tr("album")}</label>
 	<span class="required">*</span>
-	<div class="fieldHelp">{$locale->tr("add_to_album")}</div>
+	<div class="fieldHelp">{$locale->tr("add_to_album_help")}</div>
 	<select name="albumId" id="albumId">
       {foreach from=$albums item=album}
         {assign var=indentLevel value=$album->getValue("level")}
@@ -46,7 +46,7 @@
   </fieldset>
   <div class="buttons">
     <input type="reset" name="reset" value="{$locale->tr("reset")}" />
-    <input type="submit" name="AddResource" value="{$locale->tr("add_resource")}" />
+    <input type="submit" name="AddResource" value="{$locale->tr("add")}" />
     <input type="hidden" name="op" value="addResource" />
   </div>	
  </form>

Modified: plog/trunk/templates/admin/newresourcealbum.template
===================================================================
--- plog/trunk/templates/admin/newresourcealbum.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/newresourcealbum.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -38,7 +38,7 @@
    </fieldset>
    <div class="buttons">
 	<input type="reset" name="reset" value="{$locale->tr("reset")}" />
-    <input type="submit" name="addAlbum" value="{$locale->tr("add_album")}" />
+    <input type="submit" name="addAlbum" value="{$locale->tr("add")}" />
     <input type="hidden" name="op" value="addResourceAlbum" />
    </div>	
  </form>

Modified: plog/trunk/templates/admin/poststats.template
===================================================================
--- plog/trunk/templates/admin/poststats.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/poststats.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -48,7 +48,7 @@
         </div>
         <div id="list_action_bar">
 		    {include file="$admintemplatepath/adminpager.template"}<br/>
-            <input type="submit" name="delete_selected" value="{$locale->tr("delete_selected")}" class="submit" />
+            <input type="submit" name="delete" value="{$locale->tr("delete")}" class="submit" />
             <input type="hidden" name="op" value="deleteReferrers" />
         </div>		
 	</form>

Modified: plog/trunk/templates/admin/resourcealbums.template
===================================================================
--- plog/trunk/templates/admin/resourcealbums.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/resourcealbums.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -8,7 +8,7 @@
     <th>{$locale->tr("name")}</th>
     <th>{$locale->tr("children")}</th>
     <th>{$locale->tr("resources")}</th>
-    <th>{$locale->tr("show_album")}</th>
+    <th>{$locale->tr("show")}</th>
     <th>{$locale->tr("delete")}</th>
    </tr>
    {if $albumid > 0 }
@@ -38,7 +38,7 @@
    </tr>
    {/foreach}
   </table>
-  <input type="submit" name="deleteAlbums" value="{$locale->tr("delete_selected")}" />
+  <input type="submit" name="deleteAlbums" value="{$locale->tr("delete")}" />
   <input type="hidden" name="op" value="deleteResourceAlbum" />
  </form>
 </p>

Deleted: plog/trunk/templates/admin/resourcecenter.template
===================================================================
--- plog/trunk/templates/admin/resourcecenter.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/resourcecenter.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -1,16 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=resourceCenter title=$locale->tr("resourceCenter")}
-
-{$menu->generateAt("resourceCenter",2)}
-
-<p>
-<h1>{$locale->tr("welcome_resource_center")}</h1>
-{$locale->tr("total_num_resources")}: {$totalresources}<br/>
-{$locale->tr("total_size")}: {$quotausage|round}<br/>
-{if $quota > 0}
- {$locale->tr("current_quota")}: {$quota|round}<br/>
-{/if}
-</p>
-
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}

Modified: plog/trunk/templates/admin/resources.template
===================================================================
--- plog/trunk/templates/admin/resources.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/resources.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -111,7 +111,7 @@
   {include file="$admintemplatepath/adminpager.template" style=list}
   {$locale->tr("num_resources")}: <strong>{$totalresources}</strong>, {$locale->tr("total_size")}: <strong>{$quotausage|round}</strong>
   {if $quota > 0 }, {$locale->tr("quota")}: <strong>{$quota|round}</strong>{/if}
-  <input type="submit" name="delete_selected" value="{$locale->tr("delete_selected")}" class="submit" />
+  <input type="submit" name="delete" value="{$locale->tr("delete")}" class="submit" />
   <input type="hidden" name="op" value="deleteResourceItems" />
 </div>
 {include file="$admintemplatepath/footernavigation.template"}

Modified: plog/trunk/templates/admin/siteblogs.template
===================================================================
--- plog/trunk/templates/admin/siteblogs.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/siteblogs.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -80,7 +80,7 @@
   <div id="list_action_bar">
    {include file="$admintemplatepath/adminpager.template"}<br/>  
    <input type="hidden" name="op" value="deleteBlogs"/>
-   <input type="submit" name="{$locale->tr("delete_selected")}" value="{$locale->tr("delete_selected")}"/>  
+   <input type="submit" name="{$locale->tr("delete")}" value="{$locale->tr("delete")}"/>  
   </div> 
  </form>
 {include file="$admintemplatepath/footernavigation.template"}

Modified: plog/trunk/templates/admin/sitelocales.template
===================================================================
--- plog/trunk/templates/admin/sitelocales.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/sitelocales.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -13,7 +13,7 @@
      <tr>
       <th style="width:10px;"><input class="checkbox" type="checkbox" class="check" name="all" id="all" value="1" onclick="toggleAllChecks('editLocales');" /></th>
       <th style="width:85px;">{$locale->tr("locale_code")}</th>
-      <th style="width:100px;">{$locale->tr("locale_encoding")}</th>
+      <th style="width:100px;">{$locale->tr("encoding")}</th>
       <th style="width:510px">{$locale->tr("description")}</th>
       <th style="width:75px;">{$locale->tr("actions")}</th>
      </tr>
@@ -38,7 +38,7 @@
   </table>
  </div>
  <div id="list_action_bar">
-   <input type="submit" name="delete_selected" value="{$locale->tr("delete_selected")}" class="submit" />
+   <input type="submit" name="delete" value="{$locale->tr("delete")}" class="submit" />
    <input type="hidden" name="op" value="deleteLocales" />
  </div>
 </form>

Modified: plog/trunk/templates/admin/sitetemplates.template
===================================================================
--- plog/trunk/templates/admin/sitetemplates.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/sitetemplates.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -32,7 +32,7 @@
     <td>
      <div class="list_action_button">
       <a href="?op=deleteTemplate&amp;templateId={$sitetemplate->getName()}">
-        <img src="imgs/icon_delete-16.png" alt="{$locale->tr("delete_selected")}" />
+        <img src="imgs/icon_delete-16.png" alt="{$locale->tr("delete")}" />
       </a>
 	  {if $sitetemplate->hasScreenshot()}
 	    <a href="javascript:openScreenshotWindow('{$sitetemplate->getScreenshotUrl()}');">
@@ -48,7 +48,7 @@
  </div>
  <div id="list_action_bar">
    <input type="hidden" name="op" value="deleteTemplates" class="submit" />
-   <input type="submit" name="{$locale->tr("delete_selected")}" value="{$locale->tr("delete_selected")}"/>
+   <input type="submit" name="{$locale->tr("delete")}" value="{$locale->tr("delete")}"/>
  </div>
  </form>
  

Modified: plog/trunk/templates/admin/siteusers.template
===================================================================
--- plog/trunk/templates/admin/siteusers.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/siteusers.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -88,7 +88,7 @@
         </div>        
         <div id="list_action_bar">
             {include file="$admintemplatepath/adminpager.template" style=list}
-            <input type="submit" name="delete_selected" value="{$locale->tr("delete_selected")}" class="submit" />
+            <input type="submit" name="delete" value="{$locale->tr("delete")}" class="submit" />
             <input type="hidden" name="op" value="deleteUsers" />
         </div>
 	</form>

Modified: plog/trunk/templates/admin/statistics.template
===================================================================
--- plog/trunk/templates/admin/statistics.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/statistics.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -46,7 +46,7 @@
         </div>
         <div id="list_action_bar">
 			{include file="$admintemplatepath/adminpager.template"}<br/>
-            <input type="submit" name="delete_selected" value="{$locale->tr("delete_selected")}" class="submit" />
+            <input type="submit" name="delete" value="{$locale->tr("delete")}" class="submit" />
             <input type="hidden" name="op" value="deleteReferrers" />
         </div>		
 	</form>

Modified: plog/trunk/templates/admin/userprofile.template
===================================================================
--- plog/trunk/templates/admin/userprofile.template	2005-01-08 18:15:34 UTC (rev 696)
+++ plog/trunk/templates/admin/userprofile.template	2005-01-08 22:55:45 UTC (rev 697)
@@ -45,14 +45,14 @@
     <div class="field">
       <label for="userBlog">{$locale->tr("blogs")}</label>
       <span class="required"></span>
-      <div class="formHelp">{$locale->tr("related_to_the_following_blogs")}</div>
+      <div class="formHelp">{$locale->tr("user_blogs_help")}</div>
       {foreach from=$edituserblogs item=userblog}
         <a id="userBlog" href="admin.php?op=editBlog&amp;blogId={$userblog->getId()}">{$userblog->getBlog()}</a><br/>
       {/foreach}
     </div>
     <div class="field">
       <label for="userIsSiteAdmin">{$locale->tr("site_admin")}</label>
-      <span class="required"></span>
+      <span class="required">{$locale->tr("site_admin_help")}</span>
       <div class="formHelp">
         <input class="checkbox" type="checkbox" value="1" id="userIsSiteAdmin" name="userIsSiteAdmin" {if $userIsSiteAdmin} checked="checked" {/if}/>
         {$locale->tr("has_administrator_privileges")}




More information about the pLog-svn mailing list