From 44168dda8eeb24a37b070c3b33e8f473cccd687b Mon Sep 17 00:00:00 2001 From: real_nowhereman Date: Fri, 26 Sep 2008 17:22:13 +0000 Subject: [PATCH] porting bracnch fixes to trunk, raising version number --- fp-includes/core/core.system.php | 2 +- .../lang/en-us/lang.admin.widgets.php | 24 ++++++++++++------- fp-interface/sharedtpls/contact.tpl | 8 +++---- fp-interface/sharedtpls/login.tpl | 4 ++-- setup/lang/lang.en-us.php | 4 ++-- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/fp-includes/core/core.system.php b/fp-includes/core/core.system.php index 1791dbc..b2ed87a 100755 --- a/fp-includes/core/core.system.php +++ b/fp-includes/core/core.system.php @@ -73,7 +73,7 @@ - define('SYSTEM_VER', '0.804'); + define('SYSTEM_VER', '0.805'); function system_ver() { return 'fp-' . SYSTEM_VER; } diff --git a/fp-interface/lang/en-us/lang.admin.widgets.php b/fp-interface/lang/en-us/lang.admin.widgets.php index 127adf0..68993e7 100644 --- a/fp-interface/lang/en-us/lang.admin.widgets.php +++ b/fp-interface/lang/en-us/lang.admin.widgets.php @@ -8,15 +8,21 @@ $lang['admin']['widgets']['default'] = array( 'head' => 'Manage Widgets (experimental)', - 'descr' => 'A '. - 'Widget is a visual element of a '. - 'Plugin that you can put in some special areas '. - '(the widgetsets) on your blog pages '. - 'called widgetsets

'. - '

Drag a widget from the right box and drop '. - 'it to the position you prefer.

', + 'descr' => 'A '. + 'Widget is a dynamic component that can display data and interact with the user. + While Themes are meant to change how your blog looks like, Widgets + extend looks and functionalities.

+ +

Widgets can be dragged to special areas of your theme called the + WidgetSets. The number and the name of the WidgetSets may vary with the + theme you choose.

+ +

FlatPress comes with several widgets: there are widgets to help with the login, to + display a search box, etc.

+ +

Each Widget is defined by a plugin.', 'availwdgs' => 'Available Widgets', 'trashcan' => 'Drop here to delete', diff --git a/fp-interface/sharedtpls/contact.tpl b/fp-interface/sharedtpls/contact.tpl index 92f4b89..e5ef80c 100755 --- a/fp-interface/sharedtpls/contact.tpl +++ b/fp-interface/sharedtpls/contact.tpl @@ -14,15 +14,15 @@

{$lang.contact.fieldset1}


+ value="{$values.name|stripslashes|wp_specialchars:true}" />


+ value="{$values.email|stripslashes|wp_specialchars:true}" />


+ value="{$values.url|stripslashes|wp_specialchars:true}" />

{comment_form} @@ -31,7 +31,7 @@
{$lang.contact.fieldset2}


+ rows="10" cols="74">{$values.content|stripslashes|wp_specialchars:true}

diff --git a/fp-interface/sharedtpls/login.tpl b/fp-interface/sharedtpls/login.tpl index 1e2a918..fd0861e 100755 --- a/fp-interface/sharedtpls/login.tpl +++ b/fp-interface/sharedtpls/login.tpl @@ -3,9 +3,9 @@
{$lang.login.fieldset1}


-

+


-

+

diff --git a/setup/lang/lang.en-us.php b/setup/lang/lang.en-us.php index 9a90606..258419d 100644 --- a/setup/lang/lang.en-us.php +++ b/setup/lang/lang.en-us.php @@ -23,7 +23,7 @@ LangId: English 'descr' => 'Thank you for choosing FlatPress! - Before you can start having fun with your brand new blog, we have ask you a very few questions. + Before you can start having fun with your brand new blog, we have to ask you a very few questions. Don\'t worry, it won\'t take you long!', @@ -66,7 +66,7 @@ LangId: English Unbelievable? - And you\'re right: the story has just begun, but writing it\'s up to you! + And you\'re right: the story has just begun, but writing is up to you!