Enano CMS (1.1.x): comparison language/english/admin.json

equal deleted inserted replaced

-:d6c7b310295d
+:a86a69394a95
 acplo: {
 heading_main: 'You have now been logged out of the administration panel.',
 msg_logout_complete: 'You will continue to be logged into the website, but you will need to re-authenticate before you can access the administration panel again.</p><p>Return to the <a href="%mainpage_link%">Main Page</a>.',
 },
 sbedit: {
+header_msg: 'This control panel allows you to organize the sidebars, the collections of links and dynamic blocks that provide navigation for your site. Drag and drop blocks to move them between the left and right sidebars; changes will be saved automatically. Red blocks are disabled. This panel only works if you have Javascript enabled and working in your browser. <a href="%create_link%">Create a new block</a>.',
 msg_order_update_success: 'The sidebar order information was updated successfully.',
 err_demo_php_disable: 'Adding PHP code blocks in the Enano administration demo has been disabled for security reasons.',
 msg_item_added: 'The item was added.',
 create_intro: 'What type of block should this be?',
-block_type_wiki: 'Wiki-formatted block',
+block_type_wiki: 'Textual content (wikitext)',
-block_type_tpl: 'Template-formatted block (old pre-beta 3 behavior)',
+block_type_tpl: 'List of links',
-block_type_html: 'Raw HTML block',
+block_type_html: 'Pure HTML',
-block_type_php: 'PHP code block (danger, Will Robinson!)',
+block_type_php: 'PHP code',
-block_type_plugin: 'Use code from a plugin',
+block_type_plugin: 'Plugin block',
 field_block_title: 'Block title:',
 field_block_sidebar: 'Which sidebar:',
 field_block_sidebar_left: 'Left',
 field_block_sidebar_right: 'Right',
-field_wikitext: 'Wikitext:',
+field_wikitext: '<p>
-field_tplcode: 'Template code:',
+<b>This block type is for textual content.</b> This could be information, a random fact, or some other blob of fully formatted text. Links show up inline,
-field_html: 'HTML to place inside the sidebar:',
+not as a list.
+</p>
+<p>
+Wikitext:
+</p>',
+field_tplcode: '<p>
+<b>This block type is for links.</b> Use wikilinks (both internal and external are supported) to build a list of links. All links will be shown block-style,
+or one link per line. You can use logic in these blocks as well:
+</p>
+<pre>{if user_logged_in&#x7d;
+[[Special:Preferences|User control panel]]
+{/if&#x7d;</pre>
+<p>
+Template code:
+</p>',
+field_html: '<p>
+<b>This block type is for textual content.</b> HTML you use here will not be filtered or parsed at all - it will be displayed verbatim. This gives you
+slightly more control over your content but you can\'t use wikilinks or other wikitext in here.
+</p>
+<p>
+HTML to place inside the sidebar:
+</p>',
 field_php_disabled: 'Creating PHP blocks in demo mode is disabled for security reasons.',
 field_php: '<p>
 <b>WARNING:</b> If you don\'t know what you\'re doing, or if you are not fluent in PHP, stop now and choose a different block type. You will brick your Enano installation if you are not careful here.
-ALWAYS remember to write secure code! The Enano team is not responsible if someone drops all your tables because of an SQL injection vulnerability in your sidebar code. You are probably better off using the template-formatted block type.
+ALWAYS remember to write secure code! The Enano team is not responsible if someone drops all your tables because of an SQL injection vulnerability in your sidebar code. You are probably better off using the links and logic block type.
 </p>
 <p>
 <span style="color: red;">
-It is especially important to note that this code is NOT checked for errors! If there is a syntax error in your code here, it will prevent any pages from loading AT ALL. So you need to use an external PHP editor (like <a href="http://www.jedit.org">jEdit</a>) to check your syntax before you hit save.
+It is especially important to note that the syntax of your code is not validated here. If there is a syntax error in your code here, it might prevent Enano from working properly. It is recommended that you use an external PHP editor (like <a href="http://www.jedit.org">jEdit</a>) to check your syntax before you hit save.
 </span> You have been warned.
 </p>
 <p>
 Also, you should avoid using output buffering functions (ob_[start|end|get_contents|clean]) here, because Enano uses those to track output from this script.
 </p>
 <p>
-The standard &lt;?php and ?&gt; tags work here. Don\'t use an initial "&lt;?php" or it will cause a parse error.
+The standard &lt;?php and ?&gt; tags work here, but don\'t use an initial "&lt;?php" or it will cause a parse error.
 </p>
 <p>
 PHP code:
 </p>',
-field_plugin: 'Plugin:',
+field_plugin: '<p>Plugin:</p>',
 btn_create_block: 'Create new block',
 msg_block_moved: 'Item moved.',
 msg_block_deleted: 'Item deleted.',
 msg_plugin_not_loaded: 'Plugin isn\'t loaded',
 note_block_unnamed: 'Unnamed',
 hint_rename: 'Double-click to rename this block',
 note_block_disabled: '(disabled)',
-tip_disenable: 'Enable or disable this block',
+tip_disenable: 'Toggle',
-tip_edit: 'Edit the contents of this block',
+tip_edit: 'Edit block',
-tip_delete: 'Permanently delete this block',
+tip_delete: 'Delete',
-tip_move: 'Move this block to the other sidebar',
+tip_rename: 'Rename',
-msg_delete_confirm: 'Do you really want to delete this block?',
+msg_delete_confirm_title: 'Delete block',
+msg_delete_confirm_body: 'Are you sure you want to delete this sidebar block?',
+btn_delete_confirm: 'Delete block',
 btn_revert: 'Revert',
 btn_create_new_stage1: 'Create new block',
 btn_main_page: 'Main Page',
 msg_cant_edit_plugin_title: 'This block cannot be edited.',
 msg_cant_edit_plugin_body: 'This is a plugin block, and cannot be edited. <%close_link%>Close</a>',

changeset 885	a86a69394a95
parent 872	8b42e51bb6e6
child 898	c75754f5b1da