[pLog-svn] r787 - in plog/trunk: class/action/admin locale
templates/admin
oscar at devel.plogworld.net
oscar at devel.plogworld.net
Fri Jan 21 19:48:32 GMT 2005
Author: oscar
Date: 2005-01-21 19:48:32 +0000 (Fri, 21 Jan 2005)
New Revision: 787
Modified:
plog/trunk/class/action/admin/adminaddcustomfieldaction.class.php
plog/trunk/class/action/admin/adminaddlinkcategoryaction.class.php
plog/trunk/class/action/admin/adminaddresourceaction.class.php
plog/trunk/class/action/admin/adminaddresourcealbumaction.class.php
plog/trunk/class/action/admin/admindeletecustomfieldsaction.class.php
plog/trunk/class/action/admin/admindeletegalleryitemsaction.class.php
plog/trunk/class/action/admin/admindeletelinkcategoryaction.class.php
plog/trunk/class/action/admin/admindeleteresourceaction.class.php
plog/trunk/class/action/admin/admindeleteresourcealbumaction.class.php
plog/trunk/class/action/admin/admineditlinkaction.class.php
plog/trunk/class/action/admin/adminnewarticlecategoryaction.class.php
plog/trunk/class/action/admin/adminresourceinfoaction.class.php
plog/trunk/class/action/admin/adminupdatecustomfieldaction.class.php
plog/trunk/class/action/admin/adminupdatelinkaction.class.php
plog/trunk/class/action/admin/adminupdatelinkcategoryaction.class.php
plog/trunk/class/action/admin/adminupdateresourcealbumaction.class.php
plog/trunk/locale/locale_en_UK.php
plog/trunk/templates/admin/blogsettings.template
plog/trunk/templates/admin/customfields.template
plog/trunk/templates/admin/editcustomfield.template
plog/trunk/templates/admin/editlink.template
plog/trunk/templates/admin/editlinkcategory.template
plog/trunk/templates/admin/editresourcealbum.template
plog/trunk/templates/admin/newcustomfield.template
plog/trunk/templates/admin/newlinkcategory.template
plog/trunk/templates/admin/newresource.template
plog/trunk/templates/admin/newresourcealbum.template
plog/trunk/templates/admin/resourceinfo.template
plog/trunk/templates/admin/resources.template
Log:
lots of fixes and improvements to the admin interface. I've modified a bit some templates to reuse as much text as possible, plus modified some php code that generates messages. I'm also committing a partly working english locale, more to come later on.
Modified: plog/trunk/class/action/admin/adminaddcustomfieldaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddcustomfieldaction.class.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/class/action/admin/adminaddcustomfieldaction.class.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -71,7 +71,7 @@
}
else {
$this->_view = new AdminCustomFieldsListView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr( "custom_field_added_ok" ));
+ $this->_view->setSuccessMessage( $this->_locale->pr( "custom_field_added_ok", $customField->getName()));
// throw the post-event if all went fine
$this->notifyEvent( EVENT_POST_CUSTOM_FIELD_ADD, Array( "field" => &$customField ));
Modified: plog/trunk/class/action/admin/adminaddlinkcategoryaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddlinkcategoryaction.class.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/class/action/admin/adminaddlinkcategoryaction.class.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -56,7 +56,7 @@
else {
// clear the cache
CacheControl::resetBlogCache( $this->_blogInfo->getId());
- $this->_view->setSuccessMessage( $this->_locale->tr("link_category_added_ok"));
+ $this->_view->setSuccessMessage( $this->_locale->pr("link_category_added_ok", $mylinksCategory->getName()));
}
$this->setCommonData();
Modified: plog/trunk/class/action/admin/adminaddresourceaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddresourceaction.class.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/class/action/admin/adminaddresourceaction.class.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -83,22 +83,22 @@
// check if everything went fine and if not, show an error message
if( $res > 0 ) {
- $successMessage .= $this->_locale->pr("resource_added_ok", $file["name"])."<br/><br/>";
+ $successMessage .= $this->_locale->pr("resource_added_ok", $file["name"])."<br/>";
// try to fetch the resource so that we can send it in the event
$resource = $resources->getResource( $res, $this->_blogInfo->getId());
$this->notifyEvent( EVENT_POST_RESOURCE_ADD, Array( "resource" => &$resource ));
}
else {
if( $res == GALLERY_ERROR_RESOURCE_FORBIDDEN_EXTENSION )
- $errorMessage .= $this->_locale->pr("error_resource_forbidden_extension", $file["name"])."<br/><br/>";
+ $errorMessage .= $this->_locale->pr("error_resource_forbidden_extension", $file["name"])."<br/>";
elseif( $res == GALLERY_ERROR_RESOURCE_TOO_BIG )
- $errorMessage .= $this->_locale->pr("error_resource_too_big", $file["name"])."<br/><br/>";
+ $errorMessage .= $this->_locale->pr("error_resource_too_big", $file["name"])."<br/>";
elseif( $res == GALLERY_ERROR_UPLOADS_NOT_ENABLED )
- $errorMessage .= $this->_locale->tr("error_uploads_disabled" )."<br/><br/>";
+ $errorMessage .= $this->_locale->tr("error_uploads_disabled" )."<br/>";
elseif( $res == GALLERY_ERROR_QUOTA_EXCEEDED )
- $errorMessage .= $this->_locale->tr( "error_quota_exceeded" )."<br/><br/>";
+ $errorMessage .= $this->_locale->tr( "error_quota_exceeded" )."<br/>";
else
- $errorMessage .= $this->_locale->pr("error_adding_resource", $file["name"])."<br/><br/>";
+ $errorMessage .= $this->_locale->pr("error_adding_resource", $file["name"])."<br/>";
}
}
Modified: plog/trunk/class/action/admin/adminaddresourcealbumaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddresourcealbumaction.class.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/class/action/admin/adminaddresourcealbumaction.class.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -64,7 +64,7 @@
$result = $albums->addAlbum( $album );
$this->_view = new AdminResourcesListView( $this->_blogInfo, Array( "albumId" => $this->_parentId ));
if( $result ) {
- $this->_view->setSuccessMessage( $this->_locale->pr( "album_added_ok", $this->_albumName ));
+ $this->_view->setSuccessMessage( $this->_locale->pr( "album_added_ok", $album->getName()));
$this->notifyEvent( EVENT_POST_ALBUM_ADD, Array( "album" => &$album ));
// clear the cache if everything went fine
CacheControl::resetBlogCache( $this->_blogInfo->getId());
Modified: plog/trunk/class/action/admin/admindeletecustomfieldsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletecustomfieldsaction.class.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/class/action/admin/admindeletecustomfieldsaction.class.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -28,7 +28,7 @@
else
$this->registerFieldValidator( "fieldIds", new ArrayValidator());
$view = new AdminCustomFieldsListView( $this->_blogInfo );
- $view->setErrorMessage( $this->_locale->tr("no_custom_fields_selected"));
+ $view->setErrorMessage( $this->_locale->tr("error_incorrect_field_id"));
$this->setValidationErrorView( $view );
}
@@ -85,7 +85,7 @@
$errorMessage .= $this->_locale->pr( "error_deleting_field", $field->getName())."<br/>";
}
else
- $errorMessage .= $this->_locale->tr( "error_fetching_custom_field" )."<br/>";
+ $errorMessage .= $this->_locale->pr( "error_deleting_field2", $fieldId )."<br/>";
}
if( $errorMessage != "" ) $this->_view->setErrorMessage( $errorMessage );
Modified: plog/trunk/class/action/admin/admindeletegalleryitemsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletegalleryitemsaction.class.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/class/action/admin/admindeletegalleryitemsaction.class.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -75,7 +75,7 @@
}
/**
- * deletes resources from the list
+ * deletes resources from the list
*/
function _deleteResources()
{
@@ -87,28 +87,33 @@
foreach( $this->_resourceIds as $resourceId => $value ) {
// fetch the resource first, to get some info about it
$resource = $resources->getResource( $resourceId, $this->_blogInfo->getId());
-
- $this->notifyEvent( EVENT_PRE_RESOURCE_DELETE, Array( "resource" => &$resource ));
-
- // and now remove it
- $res = $resources->deleteResource( $resourceId, $this->_blogInfo->getId());
- if( $res ) {
- $this->_totalOk++;
- if( $totalOk > 2 )
- $this->_successMessage .= $this->_locale->pr("items_deleted_ok", $this->_totalOk );
- else
- $this->_successMessage .= $this->_locale->pr("item_deleted_ok", $resource->getFileName());
- $this->notifyEvent( EVENT_PRE_RESOURCE_DELETE, Array( "resource" => &$resource ));
- }
- else
- $this->_errorMessage .= $this->_locale->pr("error_deleting_item", $resource->getFileName())."<br/>";
- }
+
+ if( !$resource ) {
+ $this->_errorMessage .= $this->_locale->pr("error_deleting_resource2", $resourceId )."<br/>";
+ }
+ else {
+ $this->notifyEvent( EVENT_PRE_RESOURCE_DELETE, Array( "resource" => &$resource ));
+
+ // and now remove it
+ $res = $resources->deleteResource( $resourceId, $this->_blogInfo->getId());
+ if( $res ) {
+ $this->_totalOk++;
+ if( $this->_totalOk > 2 )
+ $this->_successMessage .= $this->_locale->pr("items_deleted_ok", $this->_totalOk );
+ else
+ $this->_successMessage .= $this->_locale->pr("item_deleted_ok", $resource->getFileName());
+ $this->notifyEvent( EVENT_PRE_RESOURCE_DELETE, Array( "resource" => &$resource ));
+ }
+ else
+ $this->_errorMessage .= $this->_locale->pr("error_deleting_resource", $resource->getFileName())."<br/>";
+ }
+ }
return true;
}
/**
- * deletes resources from the list
+ * deletes resources from the list
*/
function _deleteAlbums()
{
@@ -119,27 +124,32 @@
foreach( $this->_albumIds as $albumId => $value ) {
// fetch the resource first, to get some info about it
$album = $albums->getAlbum( $albumId, $this->_blogInfo->getId());
-
- if( $album->getNumChildren() > 0 || $album->getNumResources() > 0 ) {
- $this->_errorMessage( $this->_locale->pr("error_album_has_children", $album->getName()));
- }
- else {
- $this->notifyEvent( EVENT_PRE_ALBUM_DELETE, Array( "album" => &$album ));
-
- // and now remove it
- $res = $albums->deleteAlbum( $albumId, $this->_blogInfo->getId());
- if( $res ) {
- $this->_totalOk++;
- if( $totalOk > 2 )
- $this->_successMessage .= $this->_locale->pr("items_deleted_ok", $this->_totalOk );
- else
- $this->_successMessage .= $this->_locale->pr("item_deleted_ok", $album->getName());
-
- $this->notifyEvent( EVENT_POST_ALBUM_DELETE, Array( "album" => &$album ));
- }
- else
- $this->_errorMessage .= $this->_locale->pr("error_deleting_item", $album->getName())."<br/>";
- }
+
+ if( !$album ) {
+ $this->_errorMessage .= $this->_locale->pr( "error_deleting_album2", $albumId )."<br/>";
+ }
+ else {
+ if( $album->getNumChildren() > 0 || $album->getNumResources() > 0 ) {
+ $this->_errorMessage .= $this->_locale->pr("error_album_has_children", $album->getName());
+ }
+ else {
+ $this->notifyEvent( EVENT_PRE_ALBUM_DELETE, Array( "album" => &$album ));
+
+ // and now remove it
+ $res = $albums->deleteAlbum( $albumId, $this->_blogInfo->getId());
+ if( $res ) {
+ $this->_totalOk++;
+ if( $this->_totalOk > 2 )
+ $this->_successMessage .= $this->_locale->pr("items_deleted_ok", $this->_totalOk );
+ else
+ $this->_successMessage .= $this->_locale->pr("item_deleted_ok", $album->getName());
+
+ $this->notifyEvent( EVENT_POST_ALBUM_DELETE, Array( "album" => &$album ));
+ }
+ else
+ $this->_errorMessage .= $this->_locale->pr("error_deleting_album", $album->getName())."<br/>";
+ }
+ }
}
return true;
Modified: plog/trunk/class/action/admin/admindeletelinkcategoryaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletelinkcategoryaction.class.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/class/action/admin/admindeletelinkcategoryaction.class.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -31,14 +31,11 @@
$this->_op = $actionInfo->getActionParamValue();
$view = new AdminLinkCategoriesListView( $this->_blogInfo );
- if( $this->_op == "deleteLinkCategory" ) {
+ if( $this->_op == "deleteLinkCategory" )
$this->registerFieldValidator( "categoryId", new IntegerValidator());
- $view->setErrorMessage( $this->_locale->tr("error_incorrect_link_category_id"));
- }
- else {
+ else
$this->registerFieldValidator( "categoryIds", new ArrayValidator());
- $view->setErrorMessage( $this->_locale->tr("error_no_link_category_selected"));
- }
+ $view->setErrorMessage( $this->_locale->tr("error_invalid_link_category_id"));
$this->setValidationErrorView( $view );
}
@@ -65,6 +62,8 @@
$categories = new MyLinksCategories();
$errorMessage = "";
$successMessage = "";
+ $totalOk = 0;
+
foreach( $this->_categoryIds as $categoryId ) {
// fetch the category
$linkCategory = $categories->getMyLinksCategory( $categoryId, $this->_blogInfo->getId());
@@ -78,21 +77,28 @@
if( !$categories->deleteMyLinksCategory( $categoryId, $this->_blogInfo->getId())) {
$errorMessage .= $this->_locale->pr("error_removing_link_category", $linkCategory->getName());
}
- else
- $successMessage .= $this->_locale->pr( "link_category_deleted_ok", $linkCategory->getName())."<br/>";
+ else {
+ $totalOk++;
+ if( $totalOk < 2 )
+ $successMessage = $this->_locale->pr( "link_category_deleted_ok", $linkCategory->getName());
+ else
+ $successMessage = $this->_locale->pr( "link_categories_deleted_ok", $totalOk );
+ }
}
}
else {
- $errorMessage .= $this->_locale->pr("error_removing_link_category_2", $categoryId )."<br/>";
+ $errorMessage .= $this->_locale->pr("error_removing_link_category2", $categoryId )."<br/>";
}
}
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
$this->_view = new AdminLinkCategoriesListView( $this->_blogInfo );
if( $errorMessage != "" ) $this->_view->setErrorMessage( $errorMessage );
- if( $successMessage != "" ) $this->_view->setSuccessMessage( $successMessage );
+ if( $successMessage != "" ) {
+ $this->_view->setSuccessMessage( $successMessage );
+ // clear the cache
+ CacheControl::resetBlogCache( $this->_blogInfo->getId());
+ }
+
$this->setCommonData();
// better to return true if everything fine
Modified: plog/trunk/class/action/admin/admindeleteresourceaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeleteresourceaction.class.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/class/action/admin/admindeleteresourceaction.class.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -68,7 +68,7 @@
CacheControl::resetBlogCache( $this->_blogInfo->getId());
}
else
- $this->_view->setErrorMessage( $this->_locale->pr("error_deleting_resource", $resourceId ));
+ $this->_view->setErrorMessage( $this->_locale->pr("error_deleting_resource", $resource->getFileName()));
// return the view
$this->setCommonData();
Modified: plog/trunk/class/action/admin/admindeleteresourcealbumaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeleteresourcealbumaction.class.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/class/action/admin/admindeleteresourcealbumaction.class.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -28,7 +28,7 @@
$this->registerFieldValidator( "albumId", new IntegerValidator());
$view = new AdminResourcesListView( $this->_blogInfo );
- $view->setErrorMessage( $this->_locale->tr("error_no_albums_selected"));
+ $view->setErrorMessage( $this->_locale->tr("error_no_resources_selected"));
$this->setValidationErrorView( $view );
}
Modified: plog/trunk/class/action/admin/admineditlinkaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditlinkaction.class.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/class/action/admin/admineditlinkaction.class.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -33,7 +33,7 @@
$this->_form->registerField( "linkRssFeed" );
$this->_form->registerField( "linkUrl" );
$view = new AdminLinksListView( $this->_blogInfo );
- $view->setErrorMessage( $this->_locale->tr("error_invalid_link_id" ));
+ $view->setErrorMessage( $this->_locale->tr("error_fetching_link" ));
$this->setValidationErrorView( $view );
}
Modified: plog/trunk/class/action/admin/adminnewarticlecategoryaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminnewarticlecategoryaction.class.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/class/action/admin/adminnewarticlecategoryaction.class.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -39,6 +39,8 @@
$categoriesOrder = $blogSettings->getValue( "categories_order" );
$blogCategories = $categories->getBlogCategoriesAdmin( $this->_blogInfo->getId(), false, $categoriesOrder );
$this->_view->setValue( "categories", $blogCategories );
+ // this field should be true by default
+ $this->_view->setValue( "categoryInMainPage", true );
// better to return true if everything fine
return true;
Modified: plog/trunk/class/action/admin/adminresourceinfoaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminresourceinfoaction.class.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/class/action/admin/adminresourceinfoaction.class.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -31,7 +31,7 @@
// data validation
$this->registerFieldValidator( "resourceId", new IntegerValidator());
$view = new AdminResourcesListView( $this->_blogInfo );
- $view->setErrorMessage( $this->_locale->tr( "error_loading_resource" ));
+ $view->setErrorMessage( $this->_locale->tr( "error_fetching_resource" ));
$this->setValidationErrorView( $view );
}
@@ -47,7 +47,7 @@
if( !$resource ) {
$this->_view = new AdminResourcesListView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_loading_resource"));
+ $this->_view->setErrorMessage( $this->_locale->tr("error_fetching_resource"));
}
else {
$this->_view = new AdminEditResourceView( $this->_blogInfo );
@@ -56,11 +56,10 @@
// export some useful information
$this->_view->setValue( "resourceDescription", $resource->getDescription());
$this->_view->setValue( "albumId", $resource->getAlbumId());
+ $this->_view->setValue( "resourceDescription", $resource->getDescription());
+ $this->_view->setValue( "albumId", $resource->getAlbumId());
}
- $this->_view->setValue( "resourceDescription", $resource->getDescription());
- $this->_view->setValue( "albumId", $resource->getAlbumId());
-
$this->setCommonData();
// better to return true if everything fine
Modified: plog/trunk/class/action/admin/adminupdatecustomfieldaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminupdatecustomfieldaction.class.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/class/action/admin/adminupdatecustomfieldaction.class.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -82,7 +82,7 @@
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_custom_field" ));
}
else {
- $this->_view->setSuccessMessage( $this->_locale->tr( "custom_field_updated_ok" ));
+ $this->_view->setSuccessMessage( $this->_locale->pr( "custom_field_updated_ok", $field->getName()));
// fire the post-event
$this->notifyEvent( EVENT_POST_CUSTOM_FIELD_UPDATE, Array( "field" => &$field ));
}
Modified: plog/trunk/class/action/admin/adminupdatelinkaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminupdatelinkaction.class.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/class/action/admin/adminupdatelinkaction.class.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -95,7 +95,7 @@
// and go back to the view with the list of links
$this->_view = new AdminLinksListView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("link_updated_ok"));
+ $this->_view->setSuccessMessage( $this->_locale->pr("link_updated_ok", $link->getName()));
$this->setCommonData();
// better to return true if everything fine
Modified: plog/trunk/class/action/admin/adminupdatelinkcategoryaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminupdatelinkcategoryaction.class.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/class/action/admin/adminupdatelinkcategoryaction.class.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -31,7 +31,9 @@
// data validation
$this->registerFieldValidator( "linkCategoryName", new StringValidator());
$this->registerFieldValidator( "linkCategoryId", new IntegerValidator());
- $this->setValidationErrorView( new AdminTemplatedView( $this->_blogInfo, "editlinkcategory" ));
+ $errorView = new AdminTemplatedView( $this->_blogInfo, "editlinkcategory" );
+ $errorView->setErrorMessage( $this->_locale->tr("error_updating_link_category"));
+ $this->setValidationErrorView( $view );
}
/**
@@ -68,7 +70,7 @@
CacheControl::resetBlogCache( $this->_blogInfo->getId());
$this->_view = new AdminLinkCategoriesListView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("link_category_updated_ok"));
+ $this->_view->setSuccessMessage( $this->_locale->pr("link_category_updated_ok", $category->getName()));
$this->setCommonData();
// better to return true if everything fine
Modified: plog/trunk/class/action/admin/adminupdateresourcealbumaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminupdateresourcealbumaction.class.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/class/action/admin/adminupdateresourcealbumaction.class.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -39,7 +39,7 @@
$this->registerField( "albumDescription" );
$this->registerField( "showAlbum" );
$view = new AdminEditResourceAlbumView( $this->_blogInfo, "editresourcealbum" );
- $view->setErrorMessage( $this->_locale->tr("error_updating_resource_album" ));
+ $view->setErrorMessage( $this->_locale->tr("error_updating_album" ));
$this->setValidationErrorView( $view );
}
@@ -62,7 +62,7 @@
if( !$album ) {
$this->_view = new AdminResourcesListView( $this->_blogInfo );( $this->_blogInfo );
- $this->_view->setErrorMessage( "error_updating_resource_album" );
+ $this->_view->setErrorMessage( "error_updating_album" );
$this->setCommonData();
return false;
@@ -78,14 +78,14 @@
// and update the data in the database
if( !$albums->updateAlbum( $album )) {
$this->_view = new AdminResourcesListView( $this->_blogInfo );( $this->_blogInfo );
- $this->_view->setErrorMessage( "error_updating_resource_album" );
+ $this->_view->setErrorMessage( "error_updating_album" );
$this->setCommonData();
return false;
}
$this->_view = new AdminResourcesListView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->pr("resource_album_updated_ok", $album->getName()));
+ $this->_view->setSuccessMessage( $this->_locale->pr("album_updated_ok", $album->getName()));
$this->notifyEvent( EVENT_POST_ALBUM_UPDATE, Array( "album" => &$album ));
$this->setCommonData();
Modified: plog/trunk/locale/locale_en_UK.php
===================================================================
--- plog/trunk/locale/locale_en_UK.php 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/locale/locale_en_UK.php 2005-01-21 19:48:32 UTC (rev 787)
@@ -121,7 +121,7 @@
$messages["error_incorrect_blog_id"] = "The journal identifier is not correct.";
$messages["error_comment_without_text"] = "You should at least provide some text.";
$messages["error_comment_without_name"] = "You should at least give your name or nickname.";
-$messages["error_adding_comment"] = "There was an error adding the comment to the database.";
+$messages["error_adding_comment"] = "There was an error adding the comment.";
$messages["error_incorrect_parameter"] = "Incorrect parameter.";
$messages["error_parameter_missing"] = "There is one parameter missing from the request.";
$messages["error_blog_has_no_links"] = "This blog has no links yet.";
@@ -131,833 +131,339 @@
///////////////// STRINGS FOR THE ADMINISTRATION INTERFACE //////////////////
///////////////// //////////////////
-$messages["editLinkCategory"] = "Edit Link Category";
+// login page
+$messages["login"] = "Login";
+$messages["welcome_message"] = "Welcome to pLog";
+$messages["error_incorrect_username_or_password"] = "Sorry, Incorrect username or password.";
+$messages["error_dont_belong_to_any_blog"] = "Sorry, you don't belong to any blog yet.";
+$messages["logout_message"] = "You have been successfully logged out.";
+$messages["logout_message_2"] = "Click <a href=\"%1\$s\">here</a> to go to %2\$s</a>.";
+$messages["error_access_forbidden"] = "Access is forbidden. You must authenticate first here.";
+$messages["username"] = "Username";
+$messages["password"] = "Password";
-$messages["admin_interface_title"] = "pLog Administrative Interface";
-$messages["administration"] = "Administration";
-$messages["help"] = "Help";
-$messages["plog_help"] = "pLog Help";
+// dashboard
+$messages["dashboard"] = "Dashboard";
+
+// menu options
$messages["newPost"] = "New Post";
+$messages["Manage"] = "Manage";
+$messages["managePosts"] = "Manage Posts";
$messages["editPosts"] = "Posts";
$messages["editArticleCategories"] = "Categories";
-$messages["admin_links"] = "Links";
+$messages["newArticleCategory"] = "New Category";
+$messages["manageLinks"] = "Manage Links";
+$messages["editLinks"] = "Links";
+$messages["newLink"] = "New Link";
+$messages["editLink"] = "Edit Link";
$messages["editLinkCategories"] = "Link Categories";
-$messages["settings"] = "Settings";
-$messages["Logout"] = "Logout";
+$messages["newLinkCategory"] = "New Link Category";
+$messages["editLinkCategory"] = "Edit Link Category";
+$messages["manageCustomFields"] = "Manage Custom Fields";
+$messages["blogCustomFields"] = "Custom Fields";
+$messages["newCustomField"] = "New Custom Field";
+$messages["resourceCenter"] = "Resource Center";
+$messages["resources"] = "Resources";
+$messages["newResourceAlbum"] = "New Album";
+$messages["newResource"] = "New Resource";
+$messages["controlCenter"] = "Control Center";
+$messages["manageSettings"] = "Settings";
+$messages["blogSettings"] = "Blog Settings";
+$messages["userSettings"] = "User Settings";
+$messages["pluginCenter"] = "Plugin Center";
+$messages["Stats"] = "Statistics";
+$messages["manageBlogUsers"] = "Manage Blog Users";
+$messages["newBlogUser"] = "New Blog User";
+$messages["showBlogUsers"] = "Blog Users";
+$messages["manageBlogTemplates"] = "Blog Templates";
+$messages["newBlogTemplate"] = "New Blog Template";
+$messages["blogTemplates"] = "Blog Templates";
+$messages["adminSettings"] = "Administration";
+$messages["Users"] = "Users";
+$messages["createUser"] = "Create User";
+$messages["editSiteUsers"] = "Site Users";
+$messages["Blogs"] = "Manage Blogs";
+$messages["createBlog"] = "Create Blog";
+$messages["editSiteBlogs"] = "Site Blogs";
+$messages["Locales"] = "Manage Locales";
+$messages["newLocale"] = "New Locale";
+$messages["siteLocales"] = "Site Locales";
+$messages["Templates"] = "Manage Templates";
+$messages["newTemplate"] = "New Template";
+$messages["siteTemplates"] = "Site Templates";
+$messages["GlobalSettings"] = "Global Settings";
+$messages["editSiteSettings"] = "General";
+$messages["summarySettings"] = "Summary";
+$messages["templateSettings"] = "Templates";
+$messages["urlSettings"] = "URLs";
+$messages["emailSettings"] = "Email";
+$messages["uploadSettings"] = "Uploads";
+$messages["helpersSettings"] = "External Helpers";
+$messages["interfacesSettings"] = "Interfaces";
+$messages["securitySettings"] = "Security";
+$messages["bayesianSettings"] = "Bayesian Filter";
+$messages["resourcesSettings"] = "Resources";
+$messages["searchSettings"] = "Search";
+$messages["cleanUpSection"] = "Clean Up";
+$messages["cleanUp"] = "Clean Up";
+$messages["editResourceAlbum"] = "Edit Album";
+$messages["resourceInfo"] = "Edit Resource";
-// new post page
+// new post
$messages["topic"] = "Topic";
+$messages["topic_help"] = "Title of the post";
$messages["text"] = "Text";
-$messages["category"] = "Category";
+$messages["text_help"] = "Text of the post. This part will always appear in the front page";
+$messages["extended_text"] = "Extended Text";
+$messages["extended_text_help"] = "Extended text of the post. This part can optionally appear only in the post page or in the main page. See the blog settings for more information";
+$messages["post_slug"] = "Slug";
+$messages["post_slug_help"] = "The slug will be used to generate nice permanent links";
+$messages["date"] = "Date";
+$messages["post_date_help"] = "Date when this post is going to be published";
$messages["status"] = "Status";
-$messages["post_status_draft"] = "Draft";
+$messages["post_status_help"] = "Select one of these status";
$messages["post_status_published"] = "Published";
+$messages["post_status_draft"] = "Draft";
$messages["post_status_deleted"] = "Deleted";
-$messages["post_status_all"] = "All";
-$messages["send_notification"] = "Notify me every time there is a comment.";
-$messages["send_trackback_pings"] = "Find links in the post and send trackback pings to the links that support the feature.";
+$messages["categories"] = "Categories";
+$messages["post_categories_help"] = "Select one or more categories";
+$messages["post_comments_enabled_help"] = "Enable comments";
+$messages["send_notification_help"] = "Notification of new comments";
+$messages["send_trackback_pings_help"] = "Send trackbacks";
+$messages["send_xmlrpc_pings_help"] = "Send XMLRPC pings";
+$messages["save_draft_and_continue"] = "Save draft";
+$messages["preview"] = "Preview";
$messages["add_post"] = "Blog this!";
+$messages["error_saving_draft"] = "There was an error saving the draft";
+$messages["draft_saved_ok"] = "Draft saved successfully";
+$messages["error_sending_request"] = "There was an error sending the request";
+$messages["error_no_category_selected"] = "Please select at least one category";
+$messages["error_missing_post_topic"] = "Please type a post topic";
+$messages["error_missing_post_text"] = "Please type some text for the post";
+$messages["error_adding_post"] = "There was an error adding the post";
+$messages["post_added_not_published"] = "Post added successfully but not published";
+$messages["post_added_ok"] = "Post added successfully.";
+$messages["send_notifications_ok"] = "A notification will be sent every time there is a new comment or trackback.";
-$messages["xmlrpc_ping_ok"] = "XML-RPC Ping was correctly sent to ";
-$messages["error_sending_xmlrpc_ping"] = "There was an error sending an XML-RPC Ping to ";
-$messages["error_sending_xmlrpc_ping_message"] = "Error message was: ";
-
-$messages["preview"] = "Preview";
-$messages["post_added"] = "Post added";
-$messages["you_will_be_notified"] = "Additionally, You will be notified whenever there is some activity in this post.";
-$messages["post_added_not_published"] = "Post added but not published.";
-$messages["error_adding_post"] = "Error adding the post!";
-$messages["error_must_fill_all_fields"] = "You must fill in all the fields!";
-$messages["error_must_have_one_category"] = "You need to have at least one post category before adding a post";
-
-// send trackbacks page
-$messages["send_trackback_pings"] = "Send Trackback Pings";
-$messages["links_found"] = "The following links were found in your post. Please check the ones you
-would like to try to send a trackback ping (please note that this may take a while)";
-$messages["trackbacks_no_urls_selected"] = "No urls were selected and therefore no trackback pings were sent.";
-$messages["trackbacks_received_ok"] = "The following hosts received the trackback ping successfully:";
-$messages["trackbacks_no_trackback"] = "The following link did not have a valid trackback url: ";
-$messages["trackbacks_problems_sending"] = "There were some problems while sending the trackback pings to the following hosts.
-You can try to reach them again if you wish.";
-$messages["trackbacks_received_all_hosts"] = "All hosts successfully received the trackback ping.";
-$messages["ping_selected"] = "Ping selected sites";
-
-// edit posts
+// posts page
+$messages["show_by"] = "Show By";
+$messages["category"] = "Category";
$messages["author"] = "Author";
-$messages["category_all"] = "All";
+$messages["post_status_all"] = "All";
$messages["author_all"] = "All";
-$messages["update"] = "Update";
-$messages["date"] = "Date";
-$messages["help_Stats"] = "Stats";
+$messages["search_terms"] = "Search terms";
+$messages["show"] = "Show";
$messages["delete"] = "Delete";
+$messages["actions"] = "Actions";
+$messages["all"] = "All";
+$messages["category_all"] = "All";
+$messages["error_incorrect_article_id"] = "Incorrect article identifier";
+$messages["error_deleting_article"] = "There was an error deleting post \"%s\"";
+$messages["article_deleted_ok"] = "Post \"%s\" deleted successfully";
+$messages["articles_deleted_ok"] = "%s posts deleted successfully";
+$messages["error_deleting_article2"] = "There was an error deleting the post with identifier \"%s\"";
-$messages["delete_selected"] = "Delete Selected";
+// edit post page
+$messages["update"] = "Update";
+$messages["editPost"] = "Edit Post";
+$messages["error_fetching_post"] = "There was an error fetching the article";
-// edit post
-$messages["edit_post"] = "Edit Post";
-$messages["error_getting_post_to_update"] = "There was an error fetching the post selected for update.";
-$messages["error_updating_post_in_database"] = "Error updating the post in the database.";
-$messages["post_successfully_updated"] = "Post successfully updated.";
-$messages["notification_removed"] = "The notification you had for this article has been removed.";
+// post comments
+$messages["url"] = "URL";
+$messages["comment_status_all"] = "All";
+$messages["comment_status_spam"] = "Spam";
+$messages["comment_status_nonspam"] = "No Spam";
+$messages["error_fetching_comments"] = "There was an error while fetching the article comments";
+$messages["error_deleting_comments"] = "There was an error removing the comments or there was no comment selected";
+$messages["comment_deleted_ok"] = "Comment \"%s\" deleted successfully";
+$messages["comments_deleted_ok"] = "%s comments deleted successfully";
+$messages["error_deleting_comment"] = "There was an error deleting comment \"%s\"";
+$messages["error_deleting_comment2"] = "There was an error deleting comment with identifier %s";
+$messages["editComments"] = "Comments";
+$messages["mark_as_spam"] = "Mark as spam";
+$messages["mark_as_no_spam"] = "Mark as no spam";
+$messages["error_incorrect_comment_id"] = "The comment identifier is not correct";
+$messages["error_marking_comment_as_spam"] = "There was an error marking the comment as spam";
+$messages["comment_marked_as_spam_ok"] = "The comment was marked as spam successfully";
+$messages["error_marking_comment_as_nonspam"] = "There was an error marking the comment as no spam";
+$messages["comment_marked_as_nonspam_ok"] = "The comment was marked as no spam successfully";
+// post trackbacks
+$messages["blog"] = "Blog";
+$messages["excerpt"] = "Excerpt";
+$messages["error_fetching_trackbacks"] = "There was an error while fetching the trackbacks";
+$messages["error_deleting_trackbacks"] = "There was an error deleting the trackbacks or there were no items selected";
+$messages["error_deleting_trackback"] = "There was an error while deleting trackback \"%s\"";
+$messages["error_deleting_trackback2"] = "There was an error while deleting trackback with identifier \"%s\"";
+$messages["trackback_deleted_ok"] = "Trackback \"%s\" deleted successfully";
+$messages["trackbacks_deleted_ok"] = "%s trackbacks deleted successfully";
+$messages["editTrackbacks"] = "Trackbacks";
+
// post statistics
-$messages["statistics_for_post"] = "Statistics for post ";
-$messages["error_fetching_post"] = "There was an error fetching the post.";
-$messages["times_post_has_been_read"] = "Times post has been read: ";
-$messages["referers"] = "Referrers";
-$messages["id"] = "Id";
-$messages["url"] = "Url";
+$messages["referrer"] = "Referrer";
$messages["hits"] = "Hits";
-$messages["trackbacks"] = "Trackbacks";
+$messages["error_no_items_selected"] = "No items were selected to remove";
+$messages["error_deleting_referrer"] = "There was an error deleting referrer \"%s\"";
+$messages["error_deleting_referrer2"] = "There was an error deleting referrer with identifier \"%s\"";
+$messages["referrer_deleted_ok"] = "Referrer \"%s\" deleted successfully";
+$messages["referrers_deleted_ok"] = "%s referrers deleted successfully";
-// post comments
-$messages["error_fetching_comments"] = "Error fetching article comments";
-$messages["comments_for_post"] = "Comments for post ";
-$messages["email"] = "E-Mail";
-$messages["ip_address"] = "IP Address";
-
-// delete comments
-//*** NEW ***//
-// please remove these comments after translating these lines
-$messages["error_no_comments_selected"] = "No comments were selected to delete.";
-$messages["error_deleting_comment"] = "There was an error deleting the comment ";
-$messages["comment_deleted_ok"] = "Comment with topic \"%s\" deleted successfully.";
-//*** NEW ***//
-// please remove these comments after translating these lines
-
-
-// categories list
-$messages["category_name"] = "Name";
-
-// removing posts
-$messages["post_cannot_be_deleted"] = "Post can not be deleted";
-$messages["no_posts_selected"] = "There were no posts selected to delete.";
-// %s = subject of the post, %d = identifier of the post. feel free to change its order
-// but if you remove them there will be no information about which post was removed...
-$messages["error_deleting_post"] = "Error deleting post \"%s\" (id = %d)";
-$messages["post_deleted_ok"] = "Post \"%2\$s\" successfully deleted (id = %1\$d)";
-
-// delete categories
-$messages["no_categories_selected"] = "There were no categories selected to delete.";
-$messages["error_category_has_articles"] = "Could not delete category \"%s\" because there is at least one
-article categorized under it. Please remove the article(s) first and then try again.";
-$messages["error_deleting_category"] = "Error deleting category \"%s\" from the database.";
-$messages["category_deleted_ok"] = "Category \"%s\" successfully deleted.";
-
-$messages["newArticleCategory"] = "Add New Category";
-$messages["add_new_category_info"] = "Please provide a valid name for the new category.";
-$messages["category_added_ok"] = "Article category \"%s\" added successfully.";
-$messages["error_adding_article_category"] = "There wasn an error adding the new article category.";
-
-$messages["edit_category"] = "Edit Category";
-$messages["please_provide_valid_category_name"] = "Please provide a valid name for the category.";
-
-$messages["error_incorrect_category_id"] = "Incorrect article category identifier";
-
-$messages["error_fetching_category"] = "There was an error fetching the category.";
-$messages["error_updating_category"] = "There was an error while updating the category.";
-
-$messages["error_empty_category_name"] = "You must provide a valid name for the category.";
-
-$messages["category_updated_ok"] = "Category updated successfully.";
-
-// edit links
-$messages["link_name"] = "Name";
-$messages["link_url"] = $messages["url"];
-$messages["link_category"] = $messages["category"];
-$messages["link_description"] = "Description";
-$messages["editLinks"] = "Links";
-
-// edit a link
-$messages["error_provide_name_and_url"] = "You must at least provide a name and an url for the link.";
-$messages["error_invalid_link_id"] = "The link identifier is invalid or missing.";
-$messages["error_fetching_link"] = "There was an rrror fetching the link.";
-$messages["error_updating_link"] = "There was an error updating the link.";
-$messages["link_updated_ok"] = "Link successfully updated!";
-$messages["error_fetching_link_categories"] = "There was an error fetching the link categories.";
-
-// add a link
-$messages["add_new_link"] = "Add New Link";
-$messages["newLink"] = "Add Link";
-$messages["error_adding_link"] = "There was an error while adding the link.";
-$messages["link_added_ok"] = "Link successfully added.";
-$messages["error_provide_name_and_url"] = "You need to provide at least a valid name and address.";
-$messages["error_must_have_one_link_category"] = "You must have at least one link category before adding any link.";
-
-// delete a link
-$messages["error_no_links_selected"] = "No links were selected to delete.";
-$messages["error_removing_link"] = "Error removing link \"%s\" from the database.";
-$messages["link_deleted_ok"] = "Link \"%s\" successfully removed from the database.";
-
-// edit link categories
-$messages["newLinkCategory"] = "Add New Link Category";
-$messages["link_categories_help"] = "You must have at least one link category before adding any link.";
-$messages["link_category_name"] = "Name";
-$messages["link_category_links"] = "Links";
-
-// new link category
-$messages["new_link_category_info"] = "Link categories will help you to classify the different links you
-can have. You can also later on show your links grouped using these categories in the main page.";
-$messages["error_provide_link_category_name"] = "You must provide a valid name for the link category.";
-$messages["error_adding_link_category"] = "There was an error while adding the link category.";
-$messages["link_category_added_ok"] = "Link category successfully added.";
-
-// edit link category
-$messages["edit_link_category"] = "Edit Link Category";
-$messages["error_updating_link_category"] = "There was an error updating the link category.";
-$messages["link_category_updated_ok"] = "Link category updated successfully.";
-$messages["error_fetching_link_category"] = "Error fetching the link category.";
-$messages["error_incorrect_link_category_id"] = "Incorrecct link category identifier";
-
-
-// delete link categories
-$messages["error_no_link_category_selected"] = "No link categories were selected to delete.";
-$messages["error_links_in_link_category"] = "Category \"%s\" can not be deleted because it has links categorized
-under it. Please remove first all the links and then try again.";
-$messages["error_removing_link_category"] = "Error removing the category \"%s\".";
-$messages["link_category_deleted_ok"] = "Link category \"%s\" successfully removed.";
-// this error is shown when for some reason the category could not be fetched from the database
-// and we can't show its name
-$messages["error_removing_link_category_2"] = "Error removing link category with id = %d";
-
-// blog settings page
-$messages["blogSettings"] = "Blog Settings";
-$messages["userSettings"] = "User Profile";
-$messages["pluginCenter"] = "Plugin Center";
-$messages["Stats"] = "Statistics";
-$messages["blog_name"] = "Blog name";
-$messages["long_blog_name"] = "Longer, descriptive text about this blog";
-$messages["language_used"] = "Language used to display the texts and dates";
-$messages["items_main_page"] = "How many items would you like to show in the main page?";
-$messages["items_as_recent"] = "How many items would you like to show as \"Recent\"?";
-$messages["template_used"] = "Choose a template that will define the look of your blog";
-$messages["cut_posts"] = "Cut posts that are too long and and a \"More...\" link?";
-$messages["cut_posts_after_characters"] = "How many characters would you like to allow before cutting the post?";
-$messages["enable_wysiwyg_edition"] = "Enable WYSIWYG edition of texts (only available for Internet Explorer 5.5 or higer and Mozilla 1.3b or higher)?";
-$messages["enable_comments"] = "Enable comments for all posts?";
+// categories
+$messages["posts"] = "Posts";
+$messages["show_in_main_page"] = "Show in front page";
+$messages["error_incorrect_category_id"] = "The category identifier is not correct or no items were selected";
+$messages["error_category_has_articles"] = "Category \"%s\" is used by some articles. Please edit the articles first and then remove the category";
+$messages["category_deleted_ok"] = "Category \"%s\" deleted successfully";
+$messages["categories_deleted_ok"] = "%s categories deleted successfully";
+$messages["error_deleting_category"] = "There was an error deleting category \"%s\"";
+$messages["error_deleting_category2"] = "There was an error deleting category with identifier \"%s\"";
$messages["yes"] = "Yes";
$messages["no"] = "No";
-$messages["error_invalid_locale"] = "Invalid value for the locale settings";
-$messages["error_incorrect_max_recent_items"] = "You must provide a valid value for the number of recent items you
-would like to show.";
-$messages["error_incorrect_number_of_posts"] = "You must provide a valid value for the number of posts you
-would like to show on the main page.";
-$messages["error_incorrect_template"] = "The value for the template is not correct.";
-$messages["error_no_blog_name"] = "You must provide a valid name for your blog.";
-$messages["error_incorrect_show_more_threshold"] = "You must provide a valid value for the
-number of characters to show of a post before cutting it and adding the \"More...\" link.";
-$messages["error_updating_settings"] = "There was an error while updating the settings of the blog.";
-$messages["blog_settings_updated_ok"] = "Blog settings updated succesfully!";
-$messages["permanent_blog_url"] = "Permanent URL for this blog (read only)";
-// user profile page
-$messages["username"] = "Username";
-$messages["password"] = "Password";
-$messages["confirm_password"] = "Confirm Password";
-$messages["email_address"] = "Email address";
-$messages["bio"] = "Bio";
-$messages["empty_no_change"] = "Leave empty for no change";
-$messages["user_settings_updated_ok"] = "User settings updated successfully.";
-$messages["error_updating_user_settings"] = "Error updating user settings.";
-$messages["error_passwords_dont_match"] = "Sorry, passwords do not match.";
-$messages["error_incorrect_password"] = "Sorry, the password is not correct.";
-$messages["error_incorrect_email_address"] = "Email address is not valid.";
-
-// plugin center page
-$messages["plugins_available"] = "This is a list of the plugins available to use in the templates";
-$messages["identifier"] = "Identifier";
+// new category
+$messages["name"] = "Name";
+$messages["category_name_help"] = "Name that will be used to display the category";
$messages["description"] = "Description";
-$messages["error_plugins_disabled"] = "Support for plugins has been disabled in this site.";
-
-// statistics page
-$messages["statistics_info"] = "An article identifier of 0 means that those were incoming hits to the main
-site, not to any particular article.";
-$messages["article_id"] = "Article Id";
-$messages["last_hit_date"] = "Last Hit Date";
-$messages["error_fetching_referers"] = "Error fetching the referrers for this site";
-
-
-// login screen
-$messages["login_page_title"] = "pLog Administrative Interface";
-$messages["login"] = "Login";
-$messages["welcome_message"] = "Welcome to pLog";
-$messages["error_incorrect_username_or_password"] = "Sorry, Incorrect username or password.";
-$messages["error_dont_belong_to_any_blog"] = "Sorry, you don't belong to any blog yet.";
-$messages["error_no_username_or_password"] = "Please provide a valid username or password.";
-$messages["choose_one_blog"] = " You belong to the following blogs. Choose one to work on now";
-$messages["continue"] = "Continue";
-$messages["logout_message"] = "You have been successfully logged out.";
-$messages["logout_message_2"] = "Click <a href=\"%1\$s\">here</a> to go to %2\$s</a>.";
-$messages["logout_title"] = "Logged out";
-$messages["error_access_forbidden"] = "Access is forbidden. You must authenticate first here.";
-
-$messages["site_admin"] = "Site Admin";
-$messages["site_stats"] = "Site Statistics";
-$messages["createUser"] = "Add User";
-$messages["siteUsers"] = "Users";
-$messages["createBlog"] = "Add Blog";
-$messages["editSiteBlogs"] = "Blogs";
-$messages["siteLocales"] = "Locales";
-$messages["newLocale"] = "Add Locale";
-$messages["siteTemplates"] = "Templates";
-$messages["newTemplate"] = "Add Template";
-$messages["editSiteSettings"] = "Global Settings";
-$messages["adminSettings"] = "Site Settings";
-$messages["help_comments_enabled"] = "Enables or disables comments for the whole site.";
-$messages["help_beautify_comments_text"] = "Respects user formatting when posting a comment.";
-$messages["help_rdf_enabled"] = "Enables or disables the generation of an RDF feed with the latest posts.";
-$messages["help_temp_folder"] = "Folder that will be used by pLog to carry out some operations that need a temporary folder.";
-$messages["help_base_url"] = "This URL will be used to generate correct URLs, so please set it to the correct value";
-$messages["help_show_posts_max"] = "How many posts will be shown in the main page by default.";
-$messages["help_recent_posts_max"] = "How many posts will be shown as recent, by default.";
-$messages["help_template_folder"] = "This is where the templates used by pLog can be found.";
-$messages["help_default_template"] = "The template that will be given by default to new blogs.";
-$messages["help_default_locale"] = "The default locale settings that will be used for new blogs and in the login page of the administration interface.";
-$messages["help_html_allowed_tags_in_comments"] = "HTML tags that will not be removed from comments posted by users.";
-$messages["help_referer_tracker_enabled"] = "Adds very basic information from about the referrer to the database, if the referrer is available when receiving a request.";
-$messages["help_rss_parser_enabled"] = "Enables or disables the RSS parser that is available in the templates.";
-$messages["help_show_more_enabled"] = "Enables or disables the \"More...\" feature by default.";
-$messages["help_show_more_threshold"] = "How many characters should be left before the more link is added.";
-$messages["help_update_article_reads"] = "Whether to update or not the internal counter representing the number of times each article has been read.";
-$messages["help_request_format_mode"] = "\"Plain\" mode will generate normal URLs while \"Search Engine Friendly\" will generate URLs that are easier to read and that will be parsed by search engines. Requires Apache and the possibility to use a .htaccess file";
-$messages["help_xmlrpc_ping_enabled"] = "Whether to send an XMLRPC notification to the hosts configured below every time a post is added.";
-$messages["help_xmlrpc_ping_hosts"] = "List of hosts that support XMLRPC notifications. Please put different hosts in different lines, as many as needed.";
-$messages["help_trackback_server_enabled"] = "Whether to accept or not incoming trackback requests.";
-$messages["help_htmlarea_enabled"] = "Enables or disables the WYSIWYG editor of posts.";
-$messages["help_plugin_manager_enabled"] = "Enables or disables plugins.";
-$messages["help_check_email_address_validity"] = "When registering a new blog, users are asked for a valid email address which will be verified for authenticity if this is set to true.";
-$messages["help_summary_page_show_max"] = "How many items should be shown in the summary page.";
-$messages["help_minimum_password_length"] = "How many characters should have at least a password.";
-$messages["help_users_can_add_templates"] = "Whether users are allowed to add new blog-specific templates or not to their blogs.";
-$messages["help_email_service_enabled"] = "Enables or disables the email service, used to send for example article notifications.";
-$messages["post_notification_source_address"] = "Address that will be used as the From: field when sending out emails.";
-$messages["help_email_service_type"] = "Method that will be used to send emails. Please choose one of them and do not forget to check the settings below.";
-$messages["help_smtp_host"] = "If using SMTP as the email sending method, this is the host that will be used to send the messages.";
-$messages["help_smtp_port"] = "Port in the host above specified where the SMTP server is running.";
-$messages["help_smtp_use_authentication"] = "If the SMTP server supports authentication and would like to use it, please enable this feature and see the two settings below.";
-$messages["help_smtp_username"] = "Username that will be used when sending emails using SMTP and authentication has been enabled.";
-$messages["help_smtp_password"] = "Password that will be used when sending emails using SMTP and authentication has been enabled.";
-$messages["help_uploads_enabled"] = "Enables or disables the uploading of files. This feature will affect the uploading of new template sets and the adding of files to current existing template sets.";
-$messages["help_maximum_file_upload_size"] = "Maximum size in bytes of files uploaded by users.";
-$messages["help_upload_forbidden_files"] = "List of file patterns that are not allowed to be uploaded. You can specify as many as needed separated by a blank space.";
-$messages["help_path_to_tar"] = "Path where the 'tar' tool can be found.";
-$messages["help_path_to_gzip"] = "Path where the 'gzip' tool can be found.";
-$messages["help_path_to_bz2"] = "Path where the 'bzip2' tool can be found.";
-$messages["help_path_to_unzip"] = "Path where the 'unzip' tool can be found.";
-
-$messages["add_user_give_information"] = "Please enter the following information to create a new user.";
-
-$messages["site_registered_users"] = "These are all the users registered in this server.";
-
-$messages["add_blog_give_information"] = "Please enter the following information to create a new blog.";
-$messages["blog_title"] = "Blog title";
-$messages["blog_owner"] = "Blog owner";
-
-$messages["site_registered_blogs"] = "These are all the blogs registered in this site.";
-$messages["editSiteUsers"] = "Edit Users";
-
-$messages["upload_locale"] = "Upload locale";
-$messages["use_this_form_to_upload_locale"] = " Use this form to upload a new locale file to this server. If you don't have the possibilityto upload files, please see the form below.";
-$messages["locale_file"] = "Locale file";
-$messages["manually_add_locale"] = "Manually Add Locale";
-$messages["use_this_form_if_cant_upload_locale"] = "Use this second form if you don't have the possibility of uploading files to your server. The file must have been copied to the default locale folder before executing this operation. Otherwise it will result in an error.";
-$messages["locale_code"] = "Locale code";
-$messages["locale_encoding"] = "Encoding";
-
-$messages["template_will_be_available_for_all"] = "The new template will automatically become available to all the blogs in this site.";
-
-$messages["use_this_form_to_upload_template"] = " Use this form to upload a new template set file to this server. If you don't have the possibility to upload files, please see the form below . Template sets must be packed in zip, tar.gz or tar.bz2 files in order to be uploaded.";
-$messages["locale_file"] = "Locale file";
-$messages["upload_template"] = "Upload template";
-$messages["manually_add_template"] = "Manually Add Template";
-$messages["use_this_form_if_cannot_upload_template"] = " Use this second form if you don't have the possibility of uploading files to your server. The file must have been copied to the default template folder before executing this operation. Otherwise it will result in an error.";
-$messages["template_id"] = "Template Identifier";
-$messages["error_no_new_templates_found"] = "error! no new templates found.";
-
-$messages["templates_available_for_all"] = "This templates are available to all the blogs in this site.";
-$messages["add_file"] = "Add File";
-
-$messages["setting_name"] = "Name";
-$messages["setting_value"] = "Value";
-$messages["setting_description"] = "Description";
-
-$messages["plain"] = "Plain";
-$messages["search_engine_friendly"] = "Search Engine Friendly";
-
-$messages["general_settings"] = "General Settings";
-$messages["helper_tools_settings"] = "Helper Tools Settings";
-$messages["uploads_settings"] = "Uploads Settings";
-$messages["email_settings"] = "Email Settings";
-
-$messages["number_blogs"] = "Number of blogs";
-$messages["number_users"] = "Number of users";
-$messages["number_posts"] = "Number of posts";
-$messages["number_posts_today"] = "Number of posts today";
-$messages["number_posts_this_month"] = "Number of posts this month";
-
-$messages["date"] = "Date";
-$messages["time"] = "Time";
-
-$messages["comments_order"] = "Order in which comments appear:";
-$messages["oldest_first"] = "Oldest first";
-$messages["newest_first"] = "Newest first";
-
-$messages["blog"] = "Blog";
-$messages["blog_id"] = "Blog Numerical Identifier";
-
-$messages["showBlogUsers"] = "Blog Users";
-$messages["available_users"] = "Available Users";
+$messages["category_description_help"] = "Longer description for this category";
+$messages["show_in_main_page_help"] = "Whether posts under this category should be shown in the main page, or only when this particular category is browsed";
+$messages["error_empty_name"] = "You must provide a name";
+$messages["error_empty_description"] = "You must provide a description";
+$messages["error_adding_article_category"] = "There was an error adding the new category. Please check the data and try again";
+$messages["category_added_ok"] = "Category \"%s\" was successfully added to the blog";
$messages["add"] = "Add";
-$messages["remove"] = "Remove";
+$messages["reset"] = "Reset";
-$messages["user_id"] = "User Numerical Identifier";
+// update category
+$messages["error_updating_article_category"] = "There was an error updating the article category";
+$messages["error_fetching_category"] = "There was an error fetching the category";
+$messages["article_category_updated_ok"] = "Category \"%s\" was updated successfully";
-$messages["new_password"] = "New Password";
-$messages["has_administrator_privileges"] = "Has administrator privileges";
-$messages["related_to_the_following_blogs"] = "Related to the following blogs";
+// links
+$messages["feed"] = "Feed";
+$messages["error_no_links_selected"] = "The link identifier was incorrect or no items were selected to remove";
+$messages["error_incorrect_link_id"] = "The link identifier was not correct";
+$messages["error_removing_link"] = "There was an error removing link \"%s\"";
+$messages["error_removing_link2"] = "There was an error removing link with identifier \"%s\"";
+$messages["link_deleted_ok"] = "Link \"%s\" was deleted successfully";
+$messages["links_deleted_ok"] = "%s links deleted successfully";
-$messages["add_user_to_blog_form"] = " This form will allow you to add a user to your blog. The user will only be allowed to add or edit posts, but he or she will not be allowed to change any of the blog settings.";
-$messages["add_user_enter_username"] = " Please enter the username of the user you would like to add. The user must have registered in this server, otherwise this will cause an error.";
-$messages["add_user_send_notification"] = "Send a notification email to this user.";
-$messages["add_user_type_notification"] = "Type some text here to be sent to this user";
+// new link
+$messages["link_name_help"] = "Name given to this link";
+$messages["link_url_help"] = "Address where this link points";
+$messages["link_description_help"] = "Brief description of this link";
+$messages["link_feed_help"] = "A link to any of the RSS or Atom feeds of think can also be provided";
+$messages["link_category_help"] = "Choose one of the available link categories";
+$messages["error_adding_link"] = "There was an error adding the link. Please check the data and try again";
+$messages["error_invalid_url"] = "The address is not correct";
+$messages["link_added_ok"] = "Link \"%s\" was successfully added";
-$messages["following_users_have_permissions"] = " The following users are part of this blog. They can add, edit and remove posts but cannot change any of the settings and behaviour of this site.";
-$messages["revoke_permissions"] = "Revoke Permissions";
+// update link
+$messages["error_updating_link"] = "There was an error updating the link. Please check the data and try again";
+$messages["error_fetching_link"] = "There was an error fetching the link";
+$messages["link_updated_ok"] = "Link \"%s\" was updated successfully";
-$messages["newBlogTemplate"] = "Add Blog Template";
-$messages["manually_newBlogTemplate"] = "Manually Add Blog Template";
-$messages["template_available_only_for_this_blog"] = "This template will be made available only for this blog.";
-$messages["use_form_to_upload_blog_template"] = "Use this form to upload a new template set file to this server. If you don't have the possibility to upload files, please see the form below. Template sets must be packed in zip, tar.gz or tar.bz2 files in order to be uploaded.";
-$messages["use_form_if_cannot_upload_blog_template"] = "Use this second form if you don't have the possibility of uploading files to your server. The file must have been copied to the default template folder before executing this operation. Otherwise it will result in an error.";
+// link categories
+$messages["links"] = "Links";
+$messages["error_invalid_link_category_id"] = "The link category identifier was not correct or there was no link category selected";
+$messages["error_links_in_link_category"] = "Link category \"%s\" is used by some links. Modify the links first and try again";
+$messages["error_removing_link_category"] = "There was an error removing link category \"%s\"";
+$messages["link_category_deleted_ok"] = "Link category \"%s\" deleted succesfully";
+$messages["link_categories_deleted_ok"] = "%s link categories deleted succesfully";
+$messages["error_removing_link_category2"] = "There was an error removing link category with identifier \"%s\"";
-$messages["blogTemplates"] = "Blog Templates";
-$messages["templates_only_available_for_this_blog"] = "The following templates are only available to this blog.";
+// new link category
+$messages["link_category_name_help"] = "Name given to this link category";
+$messages["error_adding_link_category"] = "There was an error adding the new link category";
+$messages["link_category_added_ok"] = "Link category \"%s\" was successfully added";
-$messages["add_file_to_blog_template"] = "Add File to Blog Template"; $messages["upload_file_to_blog_template"] = "Please upload the file you would like to add to the template set.";
+// edit link category
+$messages["error_updating_link_category"] = "There was an error updating the link category. Please check the data and try again";
+$messages["link_category_updated_ok"] = "Link category \"%s\" updated successfully";
+$messages["error_fetching_link_category"] = "There was an error fetching the link category";
-$messages["error_user_id_incorrect"] = "Incorrect user identifier.";
-$messages["error_incorrect_user_id"] = $messages["error_user_id_incorrect"];
-$messages["error_fetching_user_information"] = "There was an error fetching the user information.";
-$messages["error_password_incorrect"] = "The password is too short or invalid.";
-$messages["error_updating_user_settings"] = "I could not update the settings for the given user.";
-$messages["user_settings_updated_ok"] = "Settings for user \"%s\" updated successfully.";
-$messages["error_no_users_selected_to_add"] = "No users were selected to add.";
-$messages["user_added_to_blog_ok"] = "The user \"%s\" has been added to the blog.";
-$messages["error_adding_user_to_blog"] = "There was an error adding the user \"%s\" to the blog.";
-$messages["error_no_users_selected_to_remove"] = "No users were selected to remove.";
-$messages["user_removed_from_blog_ok"] = "The user \"%s\" has been removed from the blog.";
-$messages["error_removing_user_from_blog"] = "There was an error removing the user \"%s\" from the blog.";
+// custom fields
+$messages["type"] = "Type";
+$messages["hidden"] = "Hidden";
+$messages["fields_deleted_ok"] = "%s custom fields deleted successfully";
+$messages["field_deleted_ok"] = "Custom field \"%s\" deleted successfully";
+$messages["error_deleting_field"] = "There was an error deleting custom field \"%s\"";
+$messages["error_deleting_field2"] = "There was an error deleting custom field with identifier \"%s\"";
+$messages["error_incorrect_field_id"] = "The custom field identifier was not valid";
-$messages["error_incorrect_plugin_id"] = "The plugin identifier is incorrect.";
-$messages["error_configuring_plugin"] = "There was an error configuring the plugin: ";
-$messages["site_config_saved_ok"] = "Site configuration was successfully saved.";
-$messages["error_saving_site_config"] = "There was a problem saving the configuration.";
+// new custom field
+$messages["field_name_help"] = "Identifer that will be used to refer to the value of this field in posts";
+$messages["field_description_help"] = "Brief description of this field that will be shown when adding or editing posts";
+$messages["field_type_help"] = "Select one of the available field types";
+$messages["field_hidden_help"] = "If a field is hidden, it will not be shown when adding a or editing a post. This feature is mainly used by plugins";
+$messages["error_adding_custom_field"] = "There was an error adding the custom field. Please check the data and try again";
+$messages["custom_field_added_ok"] = "Custom field \"%s\" added successfully";
+$messages["text_field"] = "Text field";
+$messages["text_area"] = "Text box";
+$messages["checkbox"] = "Checkbox";
+$messages["date_field"] = "Date chooser";
-$messages["error_incorrect_blog_owner"] = "The user chosen as the blog owner does not exist.";
-$messages["error_updating_blog_settings"] = "There was an error while updating the settings for blog \"%s\"";
-$messages["blog_settings_updated_ok"] = "The settings for blog \"%s\" were updated successfully.";
+// edit custom field
+$messages["error_fetching_custom_field"] = "There was an error fetching the custom field";
+$messages["error_updating_custom_field"] = "There was an error updating the custom field. Please check the data and try again";
+$messages["custom_field_updated_ok"] = "Custom field \"%s\" updated successfully";
-$messages["error_fetching_users"] = "There was an error while fetching the users in this site.";
+// resources
+$messages["root_album"] = "Root album";
+$messages["num_resources"] = "Number of resources";
+$messages["total_size"] = "Total size";
+$messages["album"] = "Album";
+$messages["error_incorrect_album_id"] = "The album identifier is not correct";
+$messages["error_base_storage_folder_missing_or_unreadable"] = "It was not possible for pLog to create the necessary folders where resources are going to be installed. This might be due to several reasons, such as your PHP installation running with safe mode enabled or your user not having enough permissions to do so. You may still try to carry out the operation manually, by creating the following folders: <br/><br/>%s<br/><br/>If these folders already exist please make sure that they can be read and written by the user running the web server.";
+$messages["items_deleted_ok"] = "%s items deleted successfully";
+$messages["error_album_has_children"] = "Album \"%s\" has children. Please edit first the album and try again";
+$messages["item_deleted_ok"] = "Item \"%s\"deleted successfully";
+$messages["error_deleting_album"] = "There was an error deleting album \"%s\"";
+$messages["error_deleting_album2"] = "There was an error deleting album with identifier \"%s\"";
+$messages["error_deleting_resource"] = "There was an error deleting resource \"%s\"";
+$messages["error_deleting_resource2"] = "There was an error deleting resource with identifier \"%s\"";
+$messages["error_no_resources_selected"] = "No items were selected to delete";
+$messages["resource_deleted_ok"] = "Resource \"%s\" was deleted successfully";
+$messages["album_deleted_ok"] = "Album \"%s\" was deleted successfully";
-$messages["error_fetching_blogs"] = "There was an error while fetching the blogs in this site.";
+// new album
+$messages["album_name_help"] = "Short name for the new album";
+$messages["parent"] = "Parent";
+$messages["no_parent"] = "No parent";
+$messages["parent_album_help"] = "Use this to have albums within albums and better organize your files";
+$messages["album_description_help"] = "Longer description of the contents of this album";
+$messages["error_adding_album"] = "There was an error adding the new album. Please check the data and try again";
+$messages["album_added_ok"] = "Album \"%s\" successfully added";
-$messages["error_incorrect_template_id"] = "The template identifier is not valid or does not exist.";
+// edit album
+$messages["error_incorrect_album_id"] = "The album identifier is not correct";
+$messages["error_fetching_album"] = "There was an error fetching the album";
+$messages["error_updating_album"] = "There was an error updating the album. Please check the data and try again";
+$messages["album_updated_ok"] = "Album \"%s\" updated successfully";
+$messages["show_album_help"] = "If disabled, the album will not be shown in the list of albums available in this blog";
-$messages["error_no_users_selected"] = "No users were selected to delete.";
-$messages["error_could_not_find_user"] = "I could not find user \"%s\" in this site.";
-$messages["error_deleting_user"] = "There was an error deleting user \"%s\"";
-$messages["user_deleted_ok"] = "User \"%s\" successfully deleted.";
+// new resource
+$messages["file"] = "File";
+$messages["resource_file_help"] = "File that will be added to the current blog. Use the 'Add field' link to upload more than one file at the same time";
+$messages["add_field"] = "Add field";
+$messages["resource_description_help"] = "Longer description of the contents of this file";
+$messages["resource_album_help"] = "Select the album to which this file will be added";
+$messages["error_no_resource_uploaded"] = "There was no file selected to upload";
+$messages["resource_added_ok"] = "Resource \"%s\" added successfully";
+$messages["error_resource_forbidden_extension"] = "The file was not added because it is of a forbidden type";
+$messages["error_resource_too_big"] = "The file was not added because it is too big";
+$messages["error_uploads_disabled"] = "The file was not added because uploads have been disabled";
+$messages["error_quota_exceeded"] = "The file was not added because resource quota has been exceeded";
+$messages["error_adding_resource"] = "There was an error adding the resource file";
-$messages["error_must_give_blog_name"] = "You must give a valid name for the blog.";
-$messages["error_adding_blog"] = "There was an error while adding the blog to the database.";
-$messages["blog_added_ok"] = "The new blog \"%s\" has been successfully added to the database.";
-
-$messages["error_template_not_inside_folder"] = "The template files must be inside a folder.";
-$messages["error_missing_base_files"] = "Some of the basic files are missing from the set.";
-$messages["error_unpacking"] = "There was an error unpacking the file.";
-$messages["error_forbidden_extensions"] = "Some files inside the template have been forbidden.";
-$messages["error_creating_working_folder"] = "There was an error checking the template set";
-$messages["error_checking_template"] = "There was an error with the template set (code = %s)";
-$messages["error_add_template_disabled"] = "Users are not allowed to add templates in this site.";
-$messages["error_must_upload_file"] = "You must upload a file.";
-$messages["error_no_template_name"] = "You must provide a template name.";
-$messages["error_uploads_disabled"] = "The upload feature has been disabled in this site.";
-$messages["error_installing_template"] = "There was an error installing the template set %s";
-$messages["template_installed_ok"] = "The new template set has been successfully installed as \"%s\".";
-
-$messages["error_adding_template_file"] = "There was an error adding the file to the template set.";
-$messages["error_file_forbidden"] = "Files of this type have been forbidden in this site.";
-$messages["error_file_too_big"] = "The file is too big. Maximum allowed size is \"%s\" bytes.";
-$messages["template_file_added_ok"] = "File added successfully to template \"%s\".";
-
-$messages["error_plugin_cannot_be_configured"] = "The plugin cannot be configured.";
-
-$messages["error_incorrect_username"] = "The username is incorrect or already exists.";
-$messages["error_username_already_exists"] = "There is already a user registered with the same username.";
-$messages["error_adding_user"] = "There was an error whiel adding the new user to the database.";
-$messages["user_added_ok"] = "The new user \"%s\" has been successfully added.";
-
-$messages["error_no_blogs_selected"] = "You must select at least one blog to delete.";
-$messages["error_blog_is_default_blog"] = "\"%s\" cannot be deleted because it is the default blog.";
-$messages["blog_deleted_ok"] = "Blog \"%s\" has been successfully deleted.";
-$messages["error_deleting_blog"] = "There was an error while deleting blog \"%s\".";
-
-$messages["error_no_templates_selected"] = "No templates were selected to remove.";
-$messages["error_removing_template"] = "There was an error removing the template \"%s\"";
-$messages["template_removed_ok"] = "Template \"%s\" removed successfully.";
-
-$messages["error_no_users_selected_to_remove_from_blog"] = "No users were selected to remove from this blog.";
-$messages["error_removing_user_from_blog"] = "There was an error removing user \"%s\" from this blog.";
-$messages["user_removed_from_blog_ok"] = "User \"%s\" has been successfully removed from this blog.";
-
-$messages["error_incorrect_locale_code"] = "The given locale code is not valid.";
-$messages["error_invalid_locale_file"] = "The file does not seem to be a valid locale file.";
-$messages["error_adding_locale_file"] = "There was an error adding the new locale file. Please make sure that the file has been uploaded to the locale folder prior to this operation and that it has correct permissions.";
-$messages["locale_added_ok"] = "The new locale \"%s\" has been successfully added.";
-$messages["error_saving_locale"] = "There was an error saving the new locale file to the locale folder. Please make sure that the folder has the right access permissions.";
-
-$messages["error_no_locales_selected"] = "No locales were selected to delete.";
-$messages["error_deleting_only_locale"] = "This is the only locale available in the system and therefore it cannot be deleted.";
-$messages["locale_deleted_ok"] = "Locale \"%s\" deleted successfully.";
-$messages["error_deleting_locale"] = "There was an error while deleting locale \"%s\"";
-$messages["error_cant_delete_default_locale"] = "\"%s\" can not be deleted because it is the default locale setting at the moment.";
-
-$messages["plugin_config"] = "Plugin Configuration";
-
-$messages["use_read_more_feature_help"] = "Show only the first part of the post in the main page? (If you select 'Yes', only the part that was typed in the 'Text' box will be shown in the main page)";
-
-$messages["extended_text_help"] = "This text will be only shown in the post page, unless we disable the feature in the 'Settings' tab";
-
-$messages["error_must_give_post_intro"] = "You must at least provide an introductory text to the post.";
-$messages["error_no_albums_defined"] = "There are no albums available in this blog.";
-$messages["error_fetching_album"] = "There was an error fetching the requested album";
-$messages["comment_marked_as_spam_ok"] = "Comment marked as spam successfully.";
-$messages["comment_marked_as_nonspam_ok"] = "Comment marked as non spam successfully.";
-$messages["error_marking_comment_as_nonspam"] = "There was an error marking the comment as non spam.";
-$messages["error_marking_comment_as_spam"] = "There was an error marking the comment as spam.";
-$messages["error_incorrect_comment_id"] = "The comment identifier was incorrect.";
-$messages["error_base_storage_folder_missing_or_unreadable"] = "It was not possible for pLog to create the necessary folders where resources are going to be installed. This might be due to several reasons, such as your PHP installation running with safe mode enabled or your user not having enough permissions to do so. You may still try to carry out the operation manually, by creating
-the following folders: <br/><br/>%s<br/><br/>If these folders already exist please make sure that they can be read and written by the user running the web server.";
-
-
-$messages["show_category_in_main_page"] = "Show this category in the main page";
-$messages["welcome_resource_center"] = "Welcome to the resource center!";
-$messages["resourceCenter"] = "Resource Center";
-$messages["resourceAlbums"] = "Resource Albums";
-$messages["resources"] = "Resources";
-$messages["newResource"] = "Add Resource";
-$messages["newResourceAlbum"] = "Add Album";
-$messages["album"] = "Album";
-$messages["album_name"] = "Album name";
-$messages["parent_album"] = "Parent album";
-$messages["no_parent_album"] = "No parent album";
-$messages["resource_info"] = "Resource Information";
+// edit resource
+$messages["information"] = "Information";
$messages["size"] = "Size";
$messages["format"] = "Format";
$messages["dimensions"] = "Dimensions";
-$messages["bits_per_sample"] = "Bits per pixel";
-$messages["bytes"] = "bytes";
-$messages["pixels"] = "pixels";
-$messages["time_offset"] = "Time difference in hours between the server and you:";
-$messages["hours"] = "Hours";
-$messages["album_added_ok"] = "The new album has been successfully added.";
-$messages["name"] = "Name";
-$messages["children"] = "Children";
-$messages["see"] = "See";
-$messages["view"] = "View";
-$messages["resource_info"] = "Resource Information";
-$messages["number_of_channels"] = "Number of channels";
-$messages["length"] = "Length";
-$messages["number_of_files"] = "Number of files";
-$messages["compressed_size"] = "Compressed size";
-$messages["uncompressed_size"] = "Uncompressed size";
-$messages["resource_file"] = "File that you would like to add";
-$messages["add_to_album"] = "Add the file to the following album";
-$messages["edit_resource_album"] = "Edit Resource Album";
-$messages["error_loading_resource_album"] = "There was an error fetching the resource album.";
-$messages["error_album_id_parameter_missing"] = "The album identifier is incorrect.";
-$messages["error_album_parent_id_parameter_missing"] = "Parent album identifier not found.";
-$messages["error_updating_resource_album"] = "There was an error updating the resource album.";
-$messages["resource_album_updated_ok"] = "The resource album \"%s\" was updated successfully.";
-$messages["error_must_give_album_name"] = "You must provide with a name for the album.";
-$messages["error_adding_album"] = "There was an error adding the resource album.";
-$messages["album_added_ok"] = "The new album \"%s\" was successfully added.";
-$messages["error_uploads_disabled"] = "The resource could not be added because uploads have been disabled in this site.";
-$messages["error_loading_resource"] = "There was an error fetching the resource";
-$messages["error_updating_resource"] = "There was an error updating the resource.";
-$messages["resource_updated_ok"] = "Resource \"%s\" was updated successfully.";
-$messages["error_no_resources_selected"] = "There were no resources selected to delete.";
-$messages["resource_deleted_ok"] = "Resource \"%s\" was successfully removed.";
-$messages["error_deleting_resource"] = "There was an error deleting resource \"%s\".";
-$messages["error_no_resource_uploaded"] = "There was no resource file uploaded.";
-$messages["blogSecurity"] = "Security";
-$messages["security_welcome"] = "Welcome to the security area!";
-$messages["error_must_create_album_first"] = "You must create an album before adding any resource.";
-$messages["error_resource_is_not_an_image"] = "The chosen resource is not an image.";
-$messages["error_generating_resource_preview"] = "There was an error regenerating the preview for this resource.";
-$messages["resource_preview_generated_ok"] = "The preview for this resource was successfully generated.";
-$messages["regenerate_preview"] = "Regenerate Preview";
-$messages["show_album"] = "Show Album";
-$messages["show_album_when_browsing"] = "Show this album to users";
-$messages["add_resource"] = "add resource";
-$messages["assigned_to_blog"] = "Assign user to the following blog";
-$messages["clean_up"] = "Clean-Up";
-$messages["purge_info"] = "The purge function will physically remove all posts that have been marked as 'Deleted'. Otherwise,
- those posts are kept in the database (in case the user would like to restore some of them) and they
- may end up being a considerable amount, uselessly enlarging the size of the database. If you are
- sure that you would like to remove such posts, please press the button below.";
-$messages["spam_info"] = "Comments marked as spam can be kept in the database in order to train the filter. Once the function
- has been accomplished, they are useless and if you wish the remove the comments marked as
- spam from the database, please use the button below.";
-$messages["no_spam"] = "No Spam";
-$messages["spam"] = "Spam";
-$messages["mark_as_spam"] = "Mark as spam";
-$messages["mark_as_no_spam"] = "Mark as no spam";
-$messages["enable_comments_for_post"] = "Enable comments for this post";
-$messages["close_window"] = "Close Window";
-$messages["newResource"] = "Add Resource";
-$messages["select_picture"] = "select picture";
-$messages["add_resource_preview"] = "Add Preview";
-$messages["newResourceAlbum"] = "Add Album";
-$messages["show_main_page"] = "Show in Main Page";
-$messages["purge_spam_comments"] = "Purge Spam Comments";
-$messages["purge_posts"] = "Purge Posts";
-$messages["keep_spam_comments"] = "Keep Spam Comments";
-$messages["throw_away_spam_comments"] = "Throw Away Spam Comments";
+$messages["bits_per_sample"] = "Bits per sample";
$messages["thumbnail_format"] = "Thumbnail format";
-$messages["same_as_image"] = "Same as original image";
-$messages["same"] = $messages["same_as_image"];
-
-
-
-$messages["help_locale_folder"] = "Folder where language files are located.";
-$messages["help_default_locale"] = "Default language settings that will be used when creating new blogs.";
-$messages["help_xmlrpc_api_enabled"] = "Enables or disables the XMLRPC interface, for posting from your desktop.";
-$messages["default_rss_profile"] = "RSS/RDF profile that will be used by default to generate feeds, if no special profile is specified";
-$messages["help_security_pipeline_enabled"] = "Enables the security features. Disabling this will disable all the security features so it is recommended to enable it and disable those features that we do not need.";
-$messages["help_ip_address_filter_enabled"] = "Enables the IP address filter, for blocking certain hosts of accessing our site.";
-$messages["help_content_filter_enabled"] = "Enables a very simple regular expression-based content filter for blocking comments that contain certain words or expressions. The Bayesian filter might be a better solution.";
-$messages["help_maximum_comment_size"] = "Maximum allowed length in bytes for comments.";
-$messages["help_bayesian_filter_enabled"] = "Enables or disables the bayesian filter.";
-$messages["help_bayesian_filter_spam_probability_treshold"] = "Minimum value at which a comment is considered spam. Should be between 0.01 and 0.99";
-$messages["help_bayesian_filter_nonspam_probability_treshold"] = "Maximum value at which a comment is safely considered as non spam. Anything between these two tresholds will still be considered non spam but it will perhaps require some additional training";
-$messages["help_bayesian_filter_min_length_token"] = "Minimum length that a token can have to be handled by the parser as a valid token.";
-$messages["help_bayesian_filter_max_length_token"] = "Maximum length that a token can have.";
-$messages["help_bayesian_filter_number_significant_tokens"] = "How many significant tokens a message must have";
-$messages["help_bayesian_filter_spam_comments_action"] = "What to with comments marked as spam. They can either be rejected and thrown away (won't even be stored in the database) or kept but marked as spam. The second option is recommended when our filter hasn't been trained much and still makes mistakes from time to time.";
-$messages["help_path_to_convert"] = "The 'convert' tool from the ImageMagick package is needed if using ImageMagick as the backend to generate thumbnails.";
-$messages["help_thumbnail_height"] = "Maximum height that thumbnails will have.";
-$messages["help_resources_folder"] = "Folder where the resources will be stored. Does not have to be in the web server tree, if you don't feel like letting people browse your resources folder. The resource server will take care of serving
-the files wherever they are.";
-
-$messages["help_thumbnails_keep_aspect_ratio"] = "Whether to keep the aspect ratio of thumbnails or not.";
-$messages["help_resources_enabled"] = "Enables or disables the 'Resource Center' feature.";
-$messages["help_thumbnail_method"] = "Backend system that will be used to generate thumbnails from image files. If using ImageMagick, please see below as some external tools are needed.";
-$messages["help_thumbnail_width"] = "Maximum width that thumbnails will have.";
-$messages["external_interfaces"] = "External Interfaces";
-$messages["security_settings"] = "Security Settings";
-$messages["bayesian_filter_settings"] = "Bayesian Filter Settings";
-$messages["resources_settings"] = "Resources Settings";
-$messages["help_thumbnail_format"] = "Default format that will be used when generating previews of images. If set to 'Same as original image', then thumbnails will be saved in the same format as the original image form which they were generated.";
-$messages["edit"] = "Edit";
-$messages["audio_codec"] = "Audio Codec";
-$messages["video_codec"] = "Video Codec";
-$messages["sample_rate"] = "Sample rate";
-$messages["files"] = "Files";
-$messages["created"] = "Created";
-$messages["generated"] = "Generated";
-$messages["about"] = "About";
-$messages["menu"] = "Menu";
-$messages["albums"] = "Albums";
-$messages["template_file"] = "Template file";
-$messages["download"] = "Download";
-$messages["help_disable_javascript_calendar"] ="Disables the javascript and DHTML-based calendar used to
-pick a date when editing or adding a post, should the user's browser be not compatible.";
-
-
-//
-// text of the post that will be added to each blog when they sign-up via the register.php script
-//
-$messages["register_default_category"] = "General";
-$messages["register_default_article_text"] = "If you can read this, it means that your signup and registration was successful and that you can start blogging.";
-$messages["register_default_article_topic"] = "Congratulations, it worked!";
-
-//
-// summary templates text
-//
-
-$messages["summary_title"] = "Blogs Summary";
-$messages["summary_section_main"] = "Summary";
-$messages["summary_section_main_link_title"] = "Main Page";
-$messages["summary_section_register"] = "Register!";
-$messages["summary_section_register_link_title"] = "Register a new blog";
-$messages["summary_section_blog_list"] = "Blog list";
-$messages["summary_section_blog_list_link_title"] = "Blogs hosted in this site";
-$messages["summary_section_faq"] = "F.A.Q.";
-$messages["summary_section_faq_link_title"] = "Frequently Asked Questions";
-$messages["summary_welcome_title"] = "Welcome to pLog!";
-
-$messages["summary_most_active_blogs"] = "Most active blogs";
-$messages["summary_newest_blogs"] = "Newest blogs";
-$messages["summary_most_commented_articles"] = "Most commented articles";
-$messages["summary_most_read_articles"] = "Most read articles";
-
-$messages["summary_faq"] = "Frequently Asked Questions";
-$messages["summary_faq_question"] = "What is this?";
-$messages["summary_faq_description"] = "You could use this section to add some frequently asked questions about your service. It is all up to you and this is only a suggestion so feel free to make changes :) Edit the file templates/summary/faq.template to change the contents of this page.";
-
-$messages["summary_login"] = "Log-in";
-$messages["summary_other_stuff"] = "Other Stuff";
-$messages["summary_plog_logo"] = "How about a logo here?";
-
-$messages["summary_blog_list"] = "Blog List";
-$messages["summary_last_updated"] = "Last Updated";
-$messages["summary_author"] = "Author";
-$messages["summary_articles"] = "articles";
-$messages["summary_reads"] = "reads";
-
-$messages["summary_welcome_message"] = "This is the summary page of your site. It will show a list with the
-most recently created blogs, the most recent posts, the most commented articles and the most active blogs. The content
-of the page is not customizable but the whole look of the site is. Please take a look at the templates/summary/ folder. If you
-wisht to add more messages or change this one, please take a look at your locale/ folder. The messages shown
-here are stored in locale/locale_en_UK.php";
-
-$messages["summary_latest_posts"] = "Latest Posts";
-$messages["summary_in"] = "in";
-$messages["summary_posted_by"] = "Posted by";
-
-//
-// register templates text
-//
-$messages["register_error"] = "Error";
-$messages["register_error_message"] = "There has been an error:";
-$messages["register_errors"] = "There were some errors during the process, please have a look:";
-$messages["register_new_blog_step1_title"] = "Register a new blog (1/3)";
-$messages["register_step1_fill_in_title"] = "Please fill in this form to create a new blog in this site.";
-$messages["register_step1_description"] = "<p>
-First of all, we need to create a user for you. Please choose a username (which should not exist in the system but if it does, we will let you know) This user will be considered as the owner of the blog and will have full powers over it.
-</p>
-<p>
-And please do not forget your password! There is no way it can be recovered once you have signed up.
-</p>";
-$messages["register_step1_legend"] = "Please fill in the following fields";
-$messages["register_username"] = "Username:";
-$messages["register_password"] = "Password:";
-$messages["register_password_confirmation"] = "Confirm password:";
-$messages["register_email"] = "Email address:";
-$messages["register_email_comment"] = "(user for notifications of new comments)";
-
-$messages["register_next"] = "Next »";
-
-$messages["register_new_blog_step2_title"] = "Register a new blog (2/3)";
-$messages["register_user_created"] = "Your new user has been successfully created! Now we can proceed and create your new personal blog.";
-$messages["register_step2_description"] = " <p>
- The only thing we need to know is the name you would like to give to your diary. Later on once this
- process is complete, you will be able to change things like its description, but now that is not needed.
- </p>";
-$messages["register_step2_blog_name"] = "Name of your new blog:";
-
-$messages["register_new_blog_step4_title"] = "Thank you! (3/3)";
-$messages["register_new_blog_step3_description"] = "
- <p>
- Registration is complete. Your new user and diary have been registered successfully in this site,
- and you can log in now into your blog and start blogging!
- </p>";
-$messages["register_step4_admin_link"] = "
- <p>
- Click here <a href=\"admin.php\">to go the admin interface</a>, if you want to start blogging.
- </p>";
-$messages["register_step4_blog_link1"] = "
- <p>
- Or click <a href=\"";
-
-$messages["register_step4_blog_link2"] = "
-\">here to go and see your new blog</a>.
- </p>";
-
-$messages["register_step4_final_message"] = "
- <p>
- Happy blogging!
- </p>";
-
-
-$messages["register_error_incorrect_username"] = "Incorrect user name or user already exists, please try again.<br/>";
-$messages["register_error_incorrect_email"] = "Email address is invalid, please try again. <br/>";
-$messages["register_error_user_already_exist"] = "There is already a user with that name, please try again.<br/>";
-$messages["register_error_incorrect_password"] = "Password is invalid, please try again. <br/>";
-$messages["register_error_passwords_dont_match"] = "Passwords do not match, please try again. <br/>";
-$messages["register_error_adding_user"] = "Error adding the user: ";
-$messages["register_error_creating_blog"] = "There was an error creating the new blog";
-$messages["register_error_blog_name"] = "You should choose a better name for the blog.<br/>" ;
-
-
-//// -------- strings added for 1.0!!! --------------- ///
-$messages["show_posts_by"] = "Show posts by";
-$messages["search_terms"] = "Search Terms";
-$messages["manage"] = "Manage";
-$messages["manage_posts"] = "Manage Posts";
-$messages["dashboard"] = "Dashboard";
-$messages["error_post_already_deleted"] = "Post \"%\" has already been marked as deleted";
-$messages["actions"] = "Actions";
-
-// modified from 0.3 for 1.0...
-$messages["error_resource_forbidden_extension"] = "The resource \"%s\" could not be added because it had a forbidden extension.";
-$messages["error_resource_too_big"] = "The resource \"%s\" could not be added because it was too big.";
-$messages["error_adding_resource"] = "There was an error adding the resource \"%s\".";
-$messages["resource_added_ok"] = "The new resource \"%s\" was successfully added.";
-
-$messages["most_recent_updated_first"] = "Most recently updated first";
-$messages["oldest_first"] = "Oldest first";
-$messages["newest_first"] = "Newest first";
-$messages["alphabetical_order"] = "Alphabetical order";
-$messages["reverse_alphabetical_order"] = "Reverse alphabetical order";
-$messages["most_articles_first"] = "Most articles first";
-$messages["most_links_first"] = "Most links first";
-$messages["most_links_last"] = "Most links last";
-
-$messages["controlCenter"] = "Control Center";
-$messages["admin"] = "Admin";
-
-$messages["user_status_all"] = "All";
-$messages["user_status_active"] = "Active";
-$messages["user_status_disabled"] = "Disabled";
-
-$messages["blog_status_all"] = "All";
-$messages["blog_status_active"] = "Active";
-$messages["blog_status_disabled"] = "Disabled";
-
-// register part
-$messages["step1"] = "step 1";
-$messages["step2"] = "step 2";
-$messages["step3"] = "step 3";
-$messages["step4"] = "step 4";
-$messages["step5"] = "step 5";
-$messages["step6"] = "step 6";
-
-$messages["register_user"] = "register user";
-$messages["password_confirm"] = "password confirm*";
-$messages["user_email_info"] = "user email info";
-$messages["blog_locale_help"] = "please select you locale setting";
-$messages["register_new_blog_step3_title"] = "Select template";
-$messages["done"] = "register finished";
-$messages["register_new_blog_step4_description"] = "We have collected all information and ready to create your account and your blog.";
-
-$messages["welcome_to_plog"] = "Welcome to plog world! Please click the url below to active your account.";
-$messages["good_wish_and_good_bye"] = "Have a nice day! \n plog team";
-
-$messages["register_need_confirm"] = "You will received an email that contain an active url to active your account, please check your mail account after a short later.";
-$messages["no_user_found"] = "user not exist, have your really registered?";
-$messages["wrong_active_code"] = "wrong active code, please try again";
-$messages["active_account_ok"] = "You have actived your account, happy blogging!";
-
-$messages["register_new_blog_step0_title"] = "User Agreement";
-
-$messages["register_new_blog_step5_title"] = "Active your account";
-$messages["register_new_blog_step5_description"] = "registration finished";
-$messages["register_finished"] = "register finished";
-
-$messages["accept"] = "accept";
-$messages["decline"] = "decline";
-
-$messages["confirm_result"] = "confirm result";
-?>
+$messages["regenerate_preview"] = "Regenerate preview";
+$messages["error_fetching_resource"] = "There was an error fetching the resource";
+$messages["error_updating_resource"] = "There was an error updating the resource";
+$messages["resource_updated_ok"] = "Resource \"%s\" updated successfully";
+?>
\ No newline at end of file
Modified: plog/trunk/templates/admin/blogsettings.template
===================================================================
--- plog/trunk/templates/admin/blogsettings.template 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/templates/admin/blogsettings.template 2005-01-21 19:48:32 UTC (rev 787)
@@ -19,17 +19,17 @@
</div>
<div class="field">
- <label for="blogName">{$locale->tr("blog_name")}</label>
+ <label for="blogName">{$locale->tr("name")}</label>
<span class="required">*</span>
<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")}
+ {include file="$admintemplatepath/validate.template" field=blogName message=$locale->tr("error_empty_name")}
</div>
<div class="field">
- <label for="blogAbout">{$locale->tr("long_blog_name")}</label>
+ <label for="blogAbout">{$locale->tr("description")}</label>
<span class="required"></span>
- <div class="formHelp">{$locale->tr("long_blog_name_help")}</div>
+ <div class="formHelp">{$locale->tr("blog_description_help")}</div>
<textarea rows="10" style="width:100%" id="blogAbout" name="blogAbout">{$blogAbout}</textarea>
</div>
@@ -52,7 +52,7 @@
<span class="required">*</span>
<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")}
+ {include file="$admintemplatepath/validate.template" field=blogMaxMainPageItems message=$locale->tr("error_invalid_number")}
</div>
<div class="field">
@@ -60,7 +60,7 @@
<span class="required">*</span>
<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")}
+ {include file="$admintemplatepath/validate.template" field=blogMaxRecentItems message=$locale->tr("error_invalid_number")}
</div>
<div class="field">
Modified: plog/trunk/templates/admin/customfields.template
===================================================================
--- plog/trunk/templates/admin/customfields.template 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/templates/admin/customfields.template 2005-01-21 19:48:32 UTC (rev 787)
@@ -35,7 +35,7 @@
{$field->getDescription()}
</td>
<td>
- {if $field->getType() == 1}{$locale->tr("text_box")}{/if}
+ {if $field->getType() == 1}{$locale->tr("text_field")}{/if}
{if $field->getType() == 2}{$locale->tr("text_area")}{/if}
{if $field->getType() == 3}{$locale->tr("checkbox")}{/if}
{if $field->getType() == 4}{$locale->tr("date_field")}{/if}
Modified: plog/trunk/templates/admin/editcustomfield.template
===================================================================
--- plog/trunk/templates/admin/editcustomfield.template 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/templates/admin/editcustomfield.template 2005-01-21 19:48:32 UTC (rev 787)
@@ -11,7 +11,7 @@
<span class="required">*</span>
<div class="formHelp">{$locale->tr("field_name_help")}</div>
<input type="text" name="fieldName" value="{$fieldName}" id="fieldName" />
- {include file="$admintemplatepath/validate.template" field=fieldName message=$locale->tr("error_must_give_field_name")}
+ {include file="$admintemplatepath/validate.template" field=fieldName message=$locale->tr("error_empty_name")}
</div>
<div class="field">
@@ -19,7 +19,7 @@
<span class="required">*</span>
<div class="formHelp">{$locale->tr("field_description_help")}</div>
<input type="text" name="fieldDescription" value="{$fieldDescription}" id="fieldDescription" />
- {include file="$admintemplatepath/validate.template" field=fieldDescription message=$locale->tr("error_must_give_field_description")}
+ {include file="$admintemplatepath/validate.template" field=fieldDescription message=$locale->tr("error_empty_description")}
</div>
<div class="field">
@@ -35,7 +35,7 @@
</div>
<div class="field">
- <label for="fieldHidden">{$locale->tr("field_hidden")}</label>
+ <label for="fieldHidden">{$locale->tr("hidden")}</label>
<span class="required">*</span>
<div class="formHelp">
<input class="checkbox" type="checkbox" name="fieldHidden" id="fieldHidden" value="1" {if $fieldHidden}checked="checked"{/if} />
Modified: plog/trunk/templates/admin/editlink.template
===================================================================
--- plog/trunk/templates/admin/editlink.template 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/templates/admin/editlink.template 2005-01-21 19:48:32 UTC (rev 787)
@@ -12,7 +12,7 @@
<span class="required">*</span>
<div class="formHelp">{$locale->tr("link_name_help")}</div>
<input type="text" name="linkName" id="linkName" value="{$linkName|escape:"html"}" />
- {include file="$admintemplatepath/validate.template" field=linkName message=$locale->tr("error_invalid_link_name")}
+ {include file="$admintemplatepath/validate.template" field=linkName message=$locale->tr("error_empty_name")}
</div>
<div class="field">
@@ -31,9 +31,9 @@
</div>
<div class="field">
- <label for="linkRssFeed">{$locale->tr("rss_feed")}</label>
+ <label for="linkRssFeed">{$locale->tr("feed")}</label>
<span class="required"></span>
- <div class="formHelp">{$locale->tr("link_rss_feed_help")}</div>
+ <div class="formHelp">{$locale->tr("link_feed_help")}</div>
<input type="text" name="linkRssFeed" id="linkRssFeed" value="{$linkRssFeed}" />
{include file="$admintemplatepath/validate.template" field=linkRssFeed message=$locale->tr("error_invalid_url")}
</div>
Modified: plog/trunk/templates/admin/editlinkcategory.template
===================================================================
--- plog/trunk/templates/admin/editlinkcategory.template 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/templates/admin/editlinkcategory.template 2005-01-21 19:48:32 UTC (rev 787)
@@ -2,14 +2,14 @@
{include file="$admintemplatepath/navigation.template" showOpt=editLinkCategories title=$locale->tr("editLinkCategory")}
<form name="editLinkCategory" method="post">
<fieldset class="inputField">
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_adding_link_category")}
+ {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_updating_link_category")}
<legend>{$locale->tr("editLinkCategory")}</legend>
<div class="field">
<label for="linkCategoryName">{$locale->tr("name")}</label>
<span class="required">*</span>
<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")}
+ {include file="$admintemplatepath/validate.template" field=linkUrl message=$locale->tr("error_empty_name")}
</div>
</fieldset>
<div class="buttons">
Modified: plog/trunk/templates/admin/editresourcealbum.template
===================================================================
--- plog/trunk/templates/admin/editresourcealbum.template 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/templates/admin/editresourcealbum.template 2005-01-21 19:48:32 UTC (rev 787)
@@ -1,5 +1,5 @@
{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=resources title=$locale->tr("resourceAlbums")}
+{include file="$admintemplatepath/navigation.template" showOpt=resources title=$locale->tr("editResourceAlbum")}
<form name="updateResourceAlbum" method="post">
<fieldset class="inputField">
<legend>{$locale->tr("editResourceAlbum")}</legend>
@@ -9,13 +9,13 @@
<span class="required">*</span>
<div class="formHelp">{$locale->tr("album_name_help")}</div>
<input type="text" id="albumName" name="albumName" value="{$albumName}" />
- {include file="$admintemplatepath/validate.template" field=albumName message=$locale->tr("error_must_give_album_name")}
+ {include file="$admintemplatepath/validate.template" field=albumName message=$locale->tr("error_empty_name")}
</div>
<div class="field">
- <label for="parentId">{$locale->tr("parent_album")}</label>
+ <label for="parentId">{$locale->tr("parent")}</label>
<div class="formHelp">{$locale->tr("parent_album_help")}</div>
<select name="parentId" id="parentId">
- <option value="0">({$locale->tr("no_parent_album")})</option>
+ <option value="0">({$locale->tr("no_parent")})</option>
{foreach from=$albums item=albumItem}
<option value="{$albumItem->getId()}" {if $albumItem->getId()==$parentId}selected="selected"{/if}>
{assign var=indentLevel value=$albumItem->getValue("level")}
@@ -30,7 +30,7 @@
<textarea name="albumDescription" id="albumDescription" rows="10" cols="60">{$albumDescription}</textarea>
</div>
<div class="field">
- <label for="showAlbum">{$locale->tr("show_album")}</label>
+ <label for="showAlbum">{$locale->tr("show")}</label>
<div class="formHelp">
<input class="checkbox" type="checkbox" id="showAlbum" name="showAlbum" value="1" {if $showAlbum == 1} checked="checked"{/if} />
{$locale->tr("show_album_help")}
Modified: plog/trunk/templates/admin/newcustomfield.template
===================================================================
--- plog/trunk/templates/admin/newcustomfield.template 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/templates/admin/newcustomfield.template 2005-01-21 19:48:32 UTC (rev 787)
@@ -11,7 +11,7 @@
<span class="required">*</span>
<div class="formHelp">{$locale->tr("field_name_help")}</div>
<input type="text" name="fieldName" value="{$fieldName}" id="fieldName" />
- {include file="$admintemplatepath/validate.template" field=fieldName message=$locale->tr("error_must_give_field_name")}
+ {include file="$admintemplatepath/validate.template" field=fieldName message=$locale->tr("error_empty_name")}
</div>
<div class="field">
@@ -19,7 +19,7 @@
<span class="required"></span>
<div class="formHelp">{$locale->tr("field_description_help")}</div>
<input type="text" name="fieldDescription" value="{$fieldDescription}" id="fieldDescription" />
- {include file="$admintemplatepath/validate.template" field=fieldDescription message=$locale->tr("error_must_give_field_description")}
+ {include file="$admintemplatepath/validate.template" field=fieldDescription message=$locale->tr("error_empty_description")}
</div>
<div class="field">
@@ -35,7 +35,7 @@
</div>
<div class="field">
- <label for="fieldHidden">{$locale->tr("field_hidden")}</label>
+ <label for="fieldHidden">{$locale->tr("hidden")}</label>
<span class="required">*</span>
<div class="formHelp">
<input class="checkbox" type="checkbox" id="fieldHidden" name="fieldHidden" value="1" {if $fieldHidden}checked="checked"{/if} />
Modified: plog/trunk/templates/admin/newlinkcategory.template
===================================================================
--- plog/trunk/templates/admin/newlinkcategory.template 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/templates/admin/newlinkcategory.template 2005-01-21 19:48:32 UTC (rev 787)
@@ -9,7 +9,7 @@
<span class="required">*</span>
<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")}
+ {include file="$admintemplatepath/validate.template" field=linkUrl message=$locale->tr("error_empty_name")}
</div>
</fieldset>
<div class="buttons">
Modified: plog/trunk/templates/admin/newresource.template
===================================================================
--- plog/trunk/templates/admin/newresource.template 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/templates/admin/newresource.template 2005-01-21 19:48:32 UTC (rev 787)
@@ -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_help")}</div>
+ <div class="formHelp">{$locale->tr("resouce_album_help")}</div>
<select name="albumId" id="albumId">
{foreach from=$albums item=album}
{assign var=indentLevel value=$album->getValue("level")}
Modified: plog/trunk/templates/admin/newresourcealbum.template
===================================================================
--- plog/trunk/templates/admin/newresourcealbum.template 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/templates/admin/newresourcealbum.template 2005-01-21 19:48:32 UTC (rev 787)
@@ -15,13 +15,13 @@
<span class="required">*</span>
<div class="formHelp">{$locale->tr("album_name_help")}</div>
<input type="text" id="albumName" name="albumName" value="{$albumName}" />
- {include file="$admintemplatepath/validate.template" field=albumName message=$locale->tr("error_must_give_album_name")}
+ {include file="$admintemplatepath/validate.template" field=albumName message=$locale->tr("error_empty_name")}
</div>
<div class="field">
- <label for="parentId">{$locale->tr("parent_album")}</label>
+ <label for="parentId">{$locale->tr("parent")}</label>
<div class="formHelp">{$locale->tr("parent_album_help")}</div>
<select name="parentId" id="parentId">
- <option value="0">({$locale->tr("no_parent_album")})</option>
+ <option value="0">({$locale->tr("no_parent")})</option>
{foreach from=$albums item=album}
<option value="{$album->getId()}" {if $album->getId()==$parentId}selected="selected"{/if}>
{assign var=indentLevel value=$album->getValue("level")}
Modified: plog/trunk/templates/admin/resourceinfo.template
===================================================================
--- plog/trunk/templates/admin/resourceinfo.template 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/templates/admin/resourceinfo.template 2005-01-21 19:48:32 UTC (rev 787)
@@ -1,8 +1,8 @@
{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=resources title=$locale->tr("resource_info")}
+{include file="$admintemplatepath/navigation.template" showOpt=resources title=$locale->tr("editResource")}
<form name="updateResourceInfo" method="post">
<fieldset class="inputField">
- <legend>{$locale->tr("resource_info")}</legend>
+ <legend>{$locale->tr("editResource")}</legend>
<div style="float:left;width:70%;border-right:1px solid #BEBEBE;">
<div class="field">
<label for="resourceLink">{$locale->tr("file")}</label>
Modified: plog/trunk/templates/admin/resources.template
===================================================================
--- plog/trunk/templates/admin/resources.template 2005-01-21 19:22:52 UTC (rev 786)
+++ plog/trunk/templates/admin/resources.template 2005-01-21 19:48:32 UTC (rev 787)
@@ -4,7 +4,7 @@
<div id="list_nav_select">
<form id="viewLinks" action="admin.php" method="post">
<fieldset>
- <legend>{$locale->tr("show_album")}</legend>
+ <legend>{$locale->tr("show_by")}</legend>
<div class="list_nav_option">
<label for="showCategory">{$locale->tr("album")}</label>
<br />
More information about the pLog-svn
mailing list