From: <pk...@us...> - 2010-03-13 22:07:44
|
Revision: 26103 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=26103&view=rev Author: pkdille Date: 2010-03-13 22:07:36 +0000 (Sat, 13 Mar 2010) Log Message: ----------- [MOD] Translated strings: some homogenization and cleanup Modified Paths: -------------- branches/5.x/lib/prefs/blog.php branches/5.x/lib/prefs/feature.php branches/5.x/lib/prefs/forums.php branches/5.x/lib/prefs/poll.php branches/5.x/lib/prefs/wiki.php branches/5.x/lib/score/events.php branches/5.x/lib/wiki-plugins/wikiplugin_footnote.php branches/5.x/lib/wiki-plugins/wikiplugin_groupmailcore.php branches/5.x/lib/wiki-plugins/wikiplugin_img.php branches/5.x/lib/wiki-plugins/wikiplugin_sheet.php branches/5.x/templates/modules/mod-calendar_new.tpl branches/5.x/templates/modules/mod-upcoming_events.tpl branches/5.x/templates/styles/strasa/tiki-view_blog.tpl branches/5.x/templates/tiki-admin.tpl branches/5.x/templates/tiki-admin_forums.tpl branches/5.x/templates/tiki-admin_integrator.tpl branches/5.x/templates/tiki-admin_menu_options.tpl branches/5.x/templates/tiki-admin_metrics.tpl branches/5.x/templates/tiki-admin_structures.tpl branches/5.x/templates/tiki-contact.tpl branches/5.x/templates/tiki-directory_browse.tpl branches/5.x/templates/tiki-directory_search.tpl branches/5.x/templates/tiki-list_contents.tpl branches/5.x/templates/tiki-minical.tpl branches/5.x/templates/tiki-mods.tpl branches/5.x/templates/tiki-payment.tpl branches/5.x/templates/tiki-sheets.tpl branches/5.x/templates/tiki-user_contacts_prefs.tpl branches/5.x/templates/tiki-user_information.tpl branches/5.x/templates/tiki-user_tasks_edit.tpl branches/5.x/templates/tiki-view_blog.tpl Modified: branches/5.x/lib/prefs/blog.php =================================================================== --- branches/5.x/lib/prefs/blog.php 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/lib/prefs/blog.php 2010-03-13 22:07:36 UTC (rev 26103) @@ -31,7 +31,7 @@ 'name' => 'Default ordering', 'type' => 'list', 'options' => array( - 'created_desc' => tra('Creation date (desc)'), + 'created_desc' => tra('Creation Date (desc)'), 'lastModif_desc' => tra('Last modification date (desc)'), 'title_asc' => tra('Blog title (asc)'), 'posts_desc' => tra('Number of posts (desc)'), Modified: branches/5.x/lib/prefs/feature.php =================================================================== --- branches/5.x/lib/prefs/feature.php 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/lib/prefs/feature.php 2010-03-13 22:07:36 UTC (rev 26103) @@ -827,7 +827,7 @@ 'type' => 'flag', ), 'feature_cms_templates' => array( - 'name' => tra('Content templates'), + 'name' => tra('Content Templates'), 'type' => 'flag', 'help' => 'Content+Template', 'description' => tra('Pre-defined content for a wiki page.'), @@ -841,7 +841,7 @@ 'type' => 'flag', ), 'feature_categorypath' => array( - 'name' => tra('Category path'), + 'name' => tra('Category Path'), 'type' => 'flag', ), 'feature_categoryobjects' => array( Modified: branches/5.x/lib/prefs/forums.php =================================================================== --- branches/5.x/lib/prefs/forums.php 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/lib/prefs/forums.php 2010-03-13 22:07:36 UTC (rev 26103) @@ -8,7 +8,7 @@ function prefs_forums_list() { return array( 'forums_ordering' => array( - 'name' => tra('Default ordering'), + 'name' => tra('Default Ordering'), 'type' => 'list', 'options' => array( 'created_asc' => tra('Creation Date (asc)'), Modified: branches/5.x/lib/prefs/poll.php =================================================================== --- branches/5.x/lib/prefs/poll.php 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/lib/prefs/poll.php 2010-03-13 22:07:36 UTC (rev 26103) @@ -14,7 +14,7 @@ 'filter' => 'digits', ), 'poll_comments_default_ordering' => array( - 'name' => tra('Default ordering'), + 'name' => tra('Default Ordering'), 'type' => 'list', 'options' => array( 'commentDate_desc' => tra('Newest first'), Modified: branches/5.x/lib/prefs/wiki.php =================================================================== --- branches/5.x/lib/prefs/wiki.php 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/lib/prefs/wiki.php 2010-03-13 22:07:36 UTC (rev 26103) @@ -218,7 +218,7 @@ 'size' => '5', ), 'wiki_comments_default_ordering' => array( - 'name' => tra('Default ordering'), + 'name' => tra('Default Ordering'), 'type' => 'list', 'options' => array( 'commentDate_desc' => tra('Newest first'), Modified: branches/5.x/lib/score/events.php =================================================================== --- branches/5.x/lib/score/events.php 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/lib/score/events.php 2010-03-13 22:07:36 UTC (rev 26103) @@ -27,7 +27,7 @@ array("feature_articles","Articles","article_new",tra("Publish an article"),20,0), array("feature_articles","Articles","article_is_read",tra("Have your article read"),1,0), // tikilib.php -array("feature_file_galleries","File galleries","fgallery_new",tra("Create new file gallery"),10,0), // filegallib.php +array("feature_file_galleries","File galleries","fgallery_new",tra("Create New File Gallery"),10,0), // filegallib.php array("feature_file_galleries","File galleries","fgallery_new_file",tra("Upload new file to gallery"),10,0), // filegallib.php array("feature_file_galleries","File galleries","fgallery_download",tra("Download other user's file"),5,0), // tikilib.php array("feature_file_galleries","File galleries","fgallery_is_downloaded",tra("Have your file downloaded"),5,0), // tikilib.php Modified: branches/5.x/lib/wiki-plugins/wikiplugin_footnote.php =================================================================== --- branches/5.x/lib/wiki-plugins/wikiplugin_footnote.php 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/lib/wiki-plugins/wikiplugin_footnote.php 2010-03-13 22:07:36 UTC (rev 26103) @@ -1,6 +1,6 @@ <?php // (c) Copyright 2002-2010 by authors of the Tiki Wiki/CMS/Groupware Project -// +// // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. // $Id$ @@ -8,54 +8,61 @@ /* by robferguson * * FOOTNOTE plugin. Inserts a superscripted number where the plugin is written starting with one and counting up as the additional footnotes are added. - * + * * Syntax: - * + * * {FOOTNOTE()/} */ -function wikiplugin_footnote_help() { - return tra("Inserts a superscripted footnote number next to text and takes in footnote as parameter").":<br />~np~{FOOTNOTE()}insert footnote here{FOOTNOTE}~/np~"; +function wikiplugin_footnote_help() +{ + return tra('Inserts a superscripted footnote number next to text and takes in footnote as parameter') + . ':<br />~np~{FOOTNOTE()}insert footnote here{FOOTNOTE}~/np~' + ; } -function wikiplugin_footnote_info() { +function wikiplugin_footnote_info() +{ return array( - 'name' => tra( 'Footnote' ), + 'name' => tra('Footnote'), 'documentation' => 'PluginFootnote', - 'description' => tra( 'Inserts a superscripted footnote number next to text and takes in footnote as parameter.' ), + 'description' => tra('Inserts a superscripted footnote number next to text and takes in footnote as parameter.'), 'prefs' => array('wikiplugin_footnote'), 'body' => tra('The footnote'), 'params' => array( - 'sameas' => array( - 'required' => false, - 'name' => tra('Sameas'), - 'description' => tra('Tag to existing footnote' )), - 'checkDuplicate' => array( - 'required' => false, - 'name' => tra('CheckDuplicate'), - 'description' => tra('check for duplcate footnotes')) - ) + 'sameas' => array( + 'required' => false, + 'name' => tra('Sameas'), + 'description' => tra('Tag to existing footnote' ) + ), + 'checkDuplicate' => array( + 'required' => false, + 'name' => tra('CheckDuplicate'), + 'description' => tra('Check for duplicate footnotes') + ) + ) ); } -function wikiplugin_footnote($data, $params) { - if (empty($params)) { - $GLOBALS["footnoteCount"]++; - $footnoteCount = $GLOBALS["footnoteCount"]; - $GLOBALS["footnotesData"][] = trim($data); - } else { - extract($params, EXTR_SKIP); - if (!empty($sameas)) { - $footnoteCount = $sameas; - } else { - if (ucfirst($checkDuplicate) == "Y") { - foreach($GLOBALS["footnotesData"] as $key => $value){ - if ( strcmp(trim($data), $value) == 0 ) { - $footnoteCount = $key + 1; - break; - } - } - } - } // else for if (!empty($sameas +function wikiplugin_footnote($data, $params) +{ + if (empty($params)) { + $GLOBALS['footnoteCount']++; + $footnoteCount = $GLOBALS['footnoteCount']; + $GLOBALS['footnotesData'][] = trim($data); + } else { + extract($params, EXTR_SKIP); + if (!empty($sameas)) { + $footnoteCount = $sameas; + } else { + if (ucfirst($checkDuplicate) == 'Y') { + foreach($GLOBALS["footnotesData"] as $key => $value) { + if ( strcmp(trim($data), $value) == 0 ) { + $footnoteCount = $key + 1; + break; + } + } + } + } // else for if (!empty($sameas } // else for if (empty($params $html = '{SUP()}' Modified: branches/5.x/lib/wiki-plugins/wikiplugin_groupmailcore.php =================================================================== --- branches/5.x/lib/wiki-plugins/wikiplugin_groupmailcore.php 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/lib/wiki-plugins/wikiplugin_groupmailcore.php 2010-03-13 22:07:36 UTC (rev 26103) @@ -37,32 +37,32 @@ ), 'operatorFId' => array( 'required' => true, - 'name' => tra('operator Field Id'), + 'name' => tra('Operator Field Id'), 'description' => tra('Id of GroupMail Logs tracker field (usually set up in alias by profile).'), ), 'subjectFId' => array( 'required' => true, - 'name' => tra('subject Field Id'), + 'name' => tra('Subject Field Id'), 'description' => tra('Id of GroupMail Logs tracker field (usually set up in alias by profile).'), ), 'messageFId' => array( 'required' => true, - 'name' => tra('message Field Id'), + 'name' => tra('Message Field Id'), 'description' => tra('Id of GroupMail Logs tracker field (usually set up in alias by profile).'), ), 'contentFId' => array( 'required' => true, - 'name' => tra('content Field Id'), + 'name' => tra('Content Field Id'), 'description' => tra('Id of GroupMail Logs tracker field (usually set up in alias by profile).'), ), 'accountFId' => array( 'required' => true, - 'name' => tra('account Field Id'), + 'name' => tra('Account Field Id'), 'description' => tra('Id of GroupMail Logs tracker field (usually set up in alias by profile).'), ), 'datetimeFId' => array( 'required' => true, - 'name' => tra('datetime Field Id'), + 'name' => tra('Datetime Field Id'), 'description' => tra('Id of GroupMail Logs tracker field (usually set up in alias by profile).'), ), ), Modified: branches/5.x/lib/wiki-plugins/wikiplugin_img.php =================================================================== --- branches/5.x/lib/wiki-plugins/wikiplugin_img.php 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/lib/wiki-plugins/wikiplugin_img.php 2010-03-13 22:07:36 UTC (rev 26103) @@ -168,7 +168,7 @@ ), 'class' => array( 'required' => false, - 'name' => tra('CSS class'), + 'name' => tra('CSS Class'), 'filter' => 'striptags', 'description' => tra('CSS class to apply to the image.'), ), Modified: branches/5.x/lib/wiki-plugins/wikiplugin_sheet.php =================================================================== --- branches/5.x/lib/wiki-plugins/wikiplugin_sheet.php 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/lib/wiki-plugins/wikiplugin_sheet.php 2010-03-13 22:07:36 UTC (rev 26103) @@ -79,7 +79,7 @@ EOF; } else { $intro = tra('Incomplete call to plugin: No target sheet.'); - $label = tra('Create new sheet'); + $label = tra('Create New Sheet'); return <<<EOF ~np~ <form method="post" action=""> Modified: branches/5.x/templates/modules/mod-calendar_new.tpl =================================================================== --- branches/5.x/templates/modules/mod-calendar_new.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/modules/mod-calendar_new.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -56,7 +56,7 @@ </table> {/if} {if $tiki_p_add_events eq 'y' && (empty($module_params.showaction) || $module_params.showaction ne 'n')} - <p><a href="tiki-calendar_edit_item.php"><img src=pics/icons/add.png link="tiki-calendar_edit_item.php"> {tr}Add event{/tr}</a></p> + <p><a href="tiki-calendar_edit_item.php"><img src=pics/icons/add.png link="tiki-calendar_edit_item.php"> {tr}Add Event{/tr}</a></p> {/if} {/tikimodule} {/if} Modified: branches/5.x/templates/modules/mod-upcoming_events.tpl =================================================================== --- branches/5.x/templates/modules/mod-upcoming_events.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/modules/mod-upcoming_events.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -40,6 +40,6 @@ {/section} </table> {if $tiki_p_add_events eq 'y' && (empty($module_params.showaction) || $module_params.showaction ne 'n')} - <p><a href="tiki-calendar_edit_item.php"><img src="pics/icons/add.png" alt="" /> {tr}Add event{/tr}</a></p> + <p><a href="tiki-calendar_edit_item.php"><img src="pics/icons/add.png" alt="" /> {tr}Add Event{/tr}</a></p> {/if} {/tikimodule} Modified: branches/5.x/templates/styles/strasa/tiki-view_blog.tpl =================================================================== --- branches/5.x/templates/styles/strasa/tiki-view_blog.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/styles/strasa/tiki-view_blog.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -17,7 +17,7 @@ <a class="bloglink" href="tiki-blog_rss.php?blogId={$blogId}">{icon _id='feed' alt='{tr}RSS feed{/tr}'}</a> {/if} {if ($user and $creator eq $user) or $tiki_p_blog_admin eq "y"} - <a class="bloglink" href="tiki-edit_blog.php?blogId={$blogId}">{icon _id='page_edit' alt='{tr}Edit blog{/tr}'}</a> + <a class="bloglink" href="tiki-edit_blog.php?blogId={$blogId}">{icon _id='page_edit' alt='{tr}Edit Blog{/tr}'}</a> {/if} {if $user and $prefs.feature_user_watches eq 'y'} Modified: branches/5.x/templates/tiki-admin.tpl =================================================================== --- branches/5.x/templates/tiki-admin.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-admin.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -75,16 +75,16 @@ <li class="{cycle}"> <p> {if $tikifeedback[n].st eq 0} - {icon _id=delete alt="{tr}disabled{/tr}" style="vertical-align: middle"} + {icon _id=delete alt="{tr}Disabled{/tr}" style="vertical-align: middle"} {elseif $tikifeedback[n].st eq 1} - {icon _id=accept alt="{tr}enabled{/tr}" style="vertical-align: middle"} + {icon _id=accept alt="{tr}Enabled{/tr}" style="vertical-align: middle"} {elseif $tikifeedback[n].st eq 2} - {icon _id=accept alt="{tr}changed{/tr}" style="vertical-align: middle"} + {icon _id=accept alt="{tr}Changed{/tr}" style="vertical-align: middle"} {else} - {icon _id=information alt="{tr}information{/tr}" style="vertical-align: middle"} + {icon _id=information alt="{tr}Information{/tr}" style="vertical-align: middle"} {/if} - {if $tikifeedback[n].st ne 3}{tr}preference{/tr} {/if}<strong>{tr}{$tikifeedback[n].mes|stringfix}{/tr}</strong><br /> - {if $tikifeedback[n].st ne 3}(<em>{tr}preference name:{/tr}</em> {$tikifeedback[n].name}){/if} + {if $tikifeedback[n].st ne 3}{tr}Preference{/tr} {/if}<strong>{tr}{$tikifeedback[n].mes|stringfix}{/tr}</strong><br /> + {if $tikifeedback[n].st ne 3}(<em>{tr}Preference name:{/tr}</em> {$tikifeedback[n].name}){/if} </p> </li> {/section} @@ -117,7 +117,7 @@ {if $prefs.feature_live_support eq 'y'} <a href="tiki-live_support_admin.php">{tr}Live Support{/tr}</a> {/if} {* TODO: to be fixed {if $prefs.feature_debug_console eq 'y'} <a href="javascript:toggle("debugconsole")">{tr}(debug){/tr}</a> {/if} *} - {if $prefs.feature_contact eq 'y'} <a href="tiki-contact.php">{tr}Contact us{/tr}</a> {/if} + {if $prefs.feature_contact eq 'y'} <a href="tiki-contact.php">{tr}Contact Us{/tr}</a> {/if} <hr /> {tr}Administration features{/tr}:<br /> Modified: branches/5.x/templates/tiki-admin_forums.tpl =================================================================== --- branches/5.x/templates/tiki-admin_forums.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-admin_forums.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -4,10 +4,10 @@ <div class="navbar"> {if $forumId > 0 or $dup_mode eq 'y'} - {button href="?" _text="{tr}Create new forum{/tr}"} + {button href="?" _text="{tr}Create New Forum{/tr}"} {/if} {if $dup_mode ne 'y'} - {button href="tiki-admin_forums.php?dup_mode=y" _text="{tr}Duplicate forum{/tr}"} + {button href="tiki-admin_forums.php?dup_mode=y" _text="{tr}Duplicate Forum{/tr}"} {/if} {if $forumId > 0} {button href="tiki-view_forum.php?forumId=$forumId" _text="{tr}View this forum{/tr}"} Modified: branches/5.x/templates/tiki-admin_integrator.tpl =================================================================== --- branches/5.x/templates/tiki-admin_integrator.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-admin_integrator.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -35,7 +35,7 @@ <td class="formcolor"><span title="{tr}File name of start page{/tr}">{tr}Start page{/tr}</span></td> <td class="formcolor"><input type="text" name="start" value="{$start|escape}" title="{tr}File name of start page{/tr}" /></td> </tr><tr> - <td class="formcolor"><span title="{tr}CSS file to load when browse this repository{/tr}">{tr}CSS file{/tr}</span></td> + <td class="formcolor"><span title="{tr}CSS file to load when browse this repository{/tr}">{tr}CSS File{/tr}</span></td> <td class="formcolor"><input type="text" name="cssfile" value="{$cssfile|escape}" title="{tr}CSS file to load when browse this repository{/tr}" /></td> </tr><tr> <td class="formcolor"><span title="{tr}Is repository visible to users{/tr}">{tr}Visible{/tr}</span></td> Modified: branches/5.x/templates/tiki-admin_menu_options.tpl =================================================================== --- branches/5.x/templates/tiki-admin_menu_options.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-admin_menu_options.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -194,7 +194,7 @@ <option value=",,,">{tr}Choose{/tr} ...</option> <option value="tiki-list_blogs.php,{tr}List Blogs{/tr},feature_blogs,tiki_p_read_blog">{tr}List Blogs{/tr}</option> <option value="tiki-blog_rankings.php,{tr}Rankings{/tr},feature_blog_rankings,tiki_p_read_blog">{tr}Rankings{/tr}</option> - <option value="tiki-edit_blog.php,{tr}Create blog{/tr},feature_blogs,tiki_p_create_blogs">{tr}Create blog{/tr}</option> + <option value="tiki-edit_blog.php,{tr}Create Blog{/tr},feature_blogs,tiki_p_create_blogs">{tr}Create Blog{/tr}</option> <option value="tiki-blog_post.php,{tr}Post{/tr},feature_blogs,tiki_p_blog_post">{tr}Post{/tr}</option> </select> </td> Modified: branches/5.x/templates/tiki-admin_metrics.tpl =================================================================== --- branches/5.x/templates/tiki-admin_metrics.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-admin_metrics.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -185,7 +185,7 @@ </td> </tr> <tr> - <td class="form {cycle advance=false}">{tr}Data type{/tr}</td> + <td class="form {cycle advance=false}">{tr}Data Type{/tr}</td> <td class="{cycle}"> <select name="metric_datatype"> {foreach from=$metric_datatype_all key=datatypeid item=datatypename} Modified: branches/5.x/templates/tiki-admin_structures.tpl =================================================================== --- branches/5.x/templates/tiki-admin_structures.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-admin_structures.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -121,7 +121,7 @@ {/tab} {if $tiki_p_edit_structures == 'y'} -{tab name="{tr}Create new structure{/tr}"} +{tab name="{tr}Create New structure{/tr}"} <form action="tiki-admin_structures.php" method="post"> <table class="normal"> <tr> Modified: branches/5.x/templates/tiki-contact.tpl =================================================================== --- branches/5.x/templates/tiki-contact.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-contact.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -1,4 +1,4 @@ -{title}{tr}Contact us{/tr}{/title} +{title}{tr}Contact Us{/tr}{/title} {if $prefs.feature_messages eq 'y' and $tiki_p_messages eq 'y'} {if $message}<br /> Modified: branches/5.x/templates/tiki-directory_browse.tpl =================================================================== --- branches/5.x/templates/tiki-directory_browse.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-directory_browse.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -86,14 +86,14 @@ <input type="hidden" name="parent" value="{$parent|escape}" /> {tr}Sort by{/tr}: <select name="sort_mode"> - <option value="name_desc" {if $sort_mode eq 'name_desc'}selected="selected"{/if}>{tr}name (desc){/tr}</option> - <option value="name_asc" {if $sort_mode eq 'name_asc'}selected="selected"{/if}>{tr}name (asc){/tr}</option> - <option value="hits_desc" {if $sort_mode eq 'hits_desc'}selected="selected"{/if}>{tr}hits (desc){/tr}</option> - <option value="hits_asc" {if $sort_mode eq 'hits_asc'}selected="selected"{/if}>{tr}hits (asc){/tr}</option> - <option value="created_desc" {if $sort_mode eq 'created_desc'}selected="selected"{/if}>{tr}creation date (desc){/tr}</option> - <option value="created_asc" {if $sort_mode eq 'created_asc'}selected="selected"{/if}>{tr}creation date (asc){/tr}</option> - <option value="lastModif_desc" {if $sort_mode eq 'lastModif_desc'}selected="selected"{/if}>{tr}last updated (desc){/tr}</option> - <option value="lastModif_asc" {if $sort_mode eq 'lastModif_asc'}selected="selected"{/if}>{tr}last updated (asc){/tr}</option> + <option value="name_desc" {if $sort_mode eq 'name_desc'}selected="selected"{/if}>{tr}Name (desc){/tr}</option> + <option value="name_asc" {if $sort_mode eq 'name_asc'}selected="selected"{/if}>{tr}Name (asc){/tr}</option> + <option value="hits_desc" {if $sort_mode eq 'hits_desc'}selected="selected"{/if}>{tr}Hits (desc){/tr}</option> + <option value="hits_asc" {if $sort_mode eq 'hits_asc'}selected="selected"{/if}>{tr}Hits (asc){/tr}</option> + <option value="created_desc" {if $sort_mode eq 'created_desc'}selected="selected"{/if}>{tr}Creation Date (desc){/tr}</option> + <option value="created_asc" {if $sort_mode eq 'created_asc'}selected="selected"{/if}>{tr}Creation Date (asc){/tr}</option> + <option value="lastModif_desc" {if $sort_mode eq 'lastModif_desc'}selected="selected"{/if}>{tr}Last updated (desc){/tr}</option> + <option value="lastModif_asc" {if $sort_mode eq 'lastModif_asc'}selected="selected"{/if}>{tr}Last updated (asc){/tr}</option> </select> <input type="submit" name="xx" value="{tr}sort{/tr}" /> </form> Modified: branches/5.x/templates/tiki-directory_search.tpl =================================================================== --- branches/5.x/templates/tiki-directory_search.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-directory_search.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -23,14 +23,14 @@ <input type="hidden" name="where" value="{$where|escape}" /> {tr}Sort by{/tr}: <select name="sort_mode"> - <option value="name_desc" {if $sort_mode eq 'name_desc'}selected="selected"{/if}>{tr}name (desc){/tr}</option> - <option value="name_asc" {if $sort_mode eq 'name_asc'}selected="selected"{/if}>{tr}name (asc){/tr}</option> - <option value="hits_desc" {if $sort_mode eq 'hits_desc'}selected="selected"{/if}>{tr}hits (desc){/tr}</option> - <option value="hits_asc" {if $sort_mode eq 'hits_asc'}selected="selected"{/if}>{tr}hits (asc){/tr}</option> - <option value="created_desc" {if $sort_mode eq 'created_desc'}selected="selected"{/if}>{tr}creation date (desc){/tr}</option> - <option value="created_asc" {if $sort_mode eq 'created_asc'}selected="selected"{/if}>{tr}creation date (asc){/tr}</option> - <option value="lastModif_desc" {if $sort_mode eq 'lastModif_desc'}selected="selected"{/if}>{tr}last updated (desc){/tr}</option> - <option value="lastModif_asc" {if $sort_mode eq 'lastModif_asc'}selected="selected"{/if}>{tr}last updated (asc){/tr}</option> + <option value="name_desc" {if $sort_mode eq 'name_desc'}selected="selected"{/if}>{tr}Name (desc){/tr}</option> + <option value="name_asc" {if $sort_mode eq 'name_asc'}selected="selected"{/if}>{tr}Name (asc){/tr}</option> + <option value="hits_desc" {if $sort_mode eq 'hits_desc'}selected="selected"{/if}>{tr}Hits (desc){/tr}</option> + <option value="hits_asc" {if $sort_mode eq 'hits_asc'}selected="selected"{/if}>{tr}Hits (asc){/tr}</option> + <option value="created_desc" {if $sort_mode eq 'created_desc'}selected="selected"{/if}>{tr}Creation Date (desc){/tr}</option> + <option value="created_asc" {if $sort_mode eq 'created_asc'}selected="selected"{/if}>{tr}Creation Date (asc){/tr}</option> + <option value="lastModif_desc" {if $sort_mode eq 'lastModif_desc'}selected="selected"{/if}>{tr}Last updated (desc){/tr}</option> + <option value="lastModif_asc" {if $sort_mode eq 'lastModif_asc'}selected="selected"{/if}>{tr}Last updated (asc){/tr}</option> </select> <input type="submit" name="xx" value="sort" /> </form> Modified: branches/5.x/templates/tiki-list_contents.tpl =================================================================== --- branches/5.x/templates/tiki-list_contents.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-list_contents.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -1,4 +1,4 @@ -{title help="Dynamic+Content"}{tr}Dynamic content system{/tr}{/title} +{title help="Dynamic+Content"}{tr}Dynamic Content System{/tr}{/title} {remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}To use content blocks in a text area (Wiki page, etc), a <a class="rbox-link" href="tiki-admin_modules.php">module</a> or a template, use {literal}{content id=x}{/literal}, where x is the ID of the content block.{/tr} {tr}You can also use {literal}{content label=x}{/literal}, where x is the label of the content block.{/tr}{/remarksbox} Modified: branches/5.x/templates/tiki-minical.tpl =================================================================== --- branches/5.x/templates/tiki-minical.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-minical.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -164,7 +164,7 @@ {/if} <a name="add"></a> -<h2>{if $eventId}{tr}Edit event{/tr}{else}{tr}Add event{/tr}{/if}</h2> +<h2>{if $eventId}{tr}Edit Event{/tr}{else}{tr}Add Event{/tr}{/if}</h2> <form action="tiki-minical.php" method="post"> <input type="hidden" name="eventId" value="{$eventId|escape}" /> <input type="hidden" name="view" value="{$view|escape}" /> Modified: branches/5.x/templates/tiki-mods.tpl =================================================================== --- branches/5.x/templates/tiki-mods.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-mods.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -164,7 +164,7 @@ </select> {tr}for version{/tr} <select name="version" onchange="this.form.submit();"> - <option value="">{tr}all versions{/tr}</option> + <option value="">{tr}All versions{/tr}</option> {foreach key=it item=i from=$versions} <option value="{$i|escape}"{if $i eq $version} selected="selected"{/if}>{$it}</option> {/foreach} Modified: branches/5.x/templates/tiki-payment.tpl =================================================================== --- branches/5.x/templates/tiki-payment.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-payment.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -17,7 +17,7 @@ {tab name="{tr}Past{/tr}"} {include file=tiki-payment-list.tpl payments=$past} {/tab} - {tab name="{tr}Canceled{/tr}"} + {tab name="{tr}Cancelled{/tr}"} {include file=tiki-payment-list.tpl payments=$canceled} {/tab} {permission name=payment_request} Modified: branches/5.x/templates/tiki-sheets.tpl =================================================================== --- branches/5.x/templates/tiki-sheets.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-sheets.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -50,7 +50,7 @@ <br /> {else} -<div class="navbar"><a href="tiki-sheets.php?edit_mode=edit&sheetId=0">{tr}Create new Sheet{/tr}</a></div> +<div class="navbar"><a href="tiki-sheets.php?edit_mode=edit&sheetId=0">{tr}Create New Sheet{/tr}</a></div> {/if} {/if} Modified: branches/5.x/templates/tiki-user_contacts_prefs.tpl =================================================================== --- branches/5.x/templates/tiki-user_contacts_prefs.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-user_contacts_prefs.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -13,7 +13,7 @@ <form method='post' action='tiki-user_contacts_prefs.php'> <table class="admin"> <tr> - <td class="form">{tr}Default view{/tr}:</td> + <td class="form">{tr}Default View{/tr}:</td> <td class="form"> <input type='radio' name='user_contacts_default_view' value='list' {if $user_contacts_default_view eq 'list'}checked="checked"{/if}/> {tr}List View{/tr} Modified: branches/5.x/templates/tiki-user_information.tpl =================================================================== --- branches/5.x/templates/tiki-user_information.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-user_information.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -102,7 +102,7 @@ {if $userPage_exists} <a class="link" href="tiki-index.php?page={$prefs.feature_wiki_userpage_prefix|escape:'url'}{$userinfo.login|escape:'url'}">{$prefs.feature_wiki_userpage_prefix}{$userinfo.login}</a> {elseif $user == $userinfo.login} - {$prefs.feature_wiki_userpage_prefix}{$userinfo.login}<a class="link" href="tiki-editpage.php?page={$prefs.feature_wiki_userpage_prefix|escape:'url'}{$userinfo.login|escape:'url'}" title="{tr}Create page{/tr}">?</a> + {$prefs.feature_wiki_userpage_prefix}{$userinfo.login}<a class="link" href="tiki-editpage.php?page={$prefs.feature_wiki_userpage_prefix|escape:'url'}{$userinfo.login|escape:'url'}" title="{tr}Create Page{/tr}">?</a> {else} {/if} </div> </div> Modified: branches/5.x/templates/tiki-user_tasks_edit.tpl =================================================================== --- branches/5.x/templates/tiki-user_tasks_edit.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-user_tasks_edit.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -11,7 +11,7 @@ <input type="hidden" name="creator" value="{$info.creator|escape}" /> {if ($tiki_view_mode eq 'view')} <span class="tabbut"> - <a href="tiki-user_tasks.php?taskId={$taskId}&tiki_view_mode=edit" class="tablink">{tr}Edit task{/tr}</a> + <a href="tiki-user_tasks.php?taskId={$taskId}&tiki_view_mode=edit" class="tablink">{tr}Edit Task{/tr}</a> </span> {/if} Modified: branches/5.x/templates/tiki-view_blog.tpl =================================================================== --- branches/5.x/templates/tiki-view_blog.tpl 2010-03-13 20:37:36 UTC (rev 26102) +++ branches/5.x/templates/tiki-view_blog.tpl 2010-03-13 22:07:36 UTC (rev 26103) @@ -18,7 +18,7 @@ <a class="bloglink" href="tiki-blog_rss.php?blogId={$blogId}">{icon _id='feed' alt='{tr}RSS feed{/tr}'}</a> {/if} {if ($user and $creator eq $user) or $tiki_p_blog_admin eq "y"} - <a class="bloglink" href="tiki-edit_blog.php?blogId={$blogId}">{icon _id='page_edit' alt='{tr}Edit blog{/tr}'}</a> + <a class="bloglink" href="tiki-edit_blog.php?blogId={$blogId}">{icon _id='page_edit' alt='{tr}Edit Blog{/tr}'}</a> {/if} {if $user and $prefs.feature_user_watches eq 'y'} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |