[pLog-svn] r6137 - in plog/trunk: . class/net install locale/admin templates/LifeType

[mark at devel.lifetype.net]

Author: mark
Date: 2008-01-02 10:44:48 -0500 (Wed, 02 Jan 2008)
New Revision: 6137

Modified:
   plog/trunk/.htaccess
   plog/trunk/class/net/rawrequestgenerator.class.php
   plog/trunk/install/defaultconfig.properties.php
   plog/trunk/locale/admin/locale_de_DE.php
   plog/trunk/locale/admin/locale_en_UK.php
   plog/trunk/locale/admin/locale_es_ES.php
   plog/trunk/locale/admin/locale_fr_FR.php
   plog/trunk/locale/admin/locale_gl_ES.php
   plog/trunk/locale/admin/locale_hu_HU.php
   plog/trunk/locale/admin/locale_it_IT.php
   plog/trunk/locale/admin/locale_ru_RU.php
   plog/trunk/locale/admin/locale_tt_RU.php
   plog/trunk/locale/admin/locale_vi_VN.php
   plog/trunk/locale/admin/locale_zh_CN.php
   plog/trunk/locale/admin/locale_zh_TW.php
   plog/trunk/templates/LifeType/header.template
   plog/trunk/templates/LifeType/headermain.template
Log:
Merge from LifeType 1.2 development branches rev. 6021:6060

Modified: plog/trunk/.htaccess
===================================================================
--- plog/trunk/.htaccess	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/.htaccess	2008-01-02 15:44:48 UTC (rev 6137)
@@ -16,8 +16,13 @@
 RewriteEngine On
 RewriteBase /
 
+  # Point to the sitemap file that is local to the blog
+RewriteRule ^sitemap([0-9]+)\.gz$ tmp/sitemap/$1/sitemap.gz [L,NC]
+
 # Permalink to the blog entry (i.e. /1_userfoo/archive/3_title-foo-bar.html)
 RewriteRule ^([0-9]+)_[^/]+/archive/([0-9]+)_[^.]+\.html$ index.php?op=ViewArticle&blogId=$1&articleId=$2 [L,NC]
+# -- same as above but with paging included
+RewriteRule ^([0-9]+)_[^/]+/archive/([0-9]+)_[^.]+\.html\.page\.([1-9]+)$ index.php?op=ViewArticle&blogId=$1&articleId=$2&page=$3 [L,NC]
 
 # Monthly archive (i.e. /1_userfoo/archive/200401.html)
 RewriteRule ^([0-9]+)_[^/]+/archive/([0-9]{6})\.html$ index.php?blogId=$1&Date=$2 [L,NC]
@@ -61,9 +66,9 @@
 RewriteRule ^([0-9]+)_[^/]+/get/(.+)$ resserver.php?blogId=$1&resource=$2 [L,NC]
 
 # A non-default blog (i.e. /88_userfoo)
-RewriteRule ^([0-9]+)(_[^/]+)?$ index.php?blogId=$1 [L,NC]
+RewriteRule ^([0-9]+)_[^.]+$ index.php?blogId=$1 [L,NC]
 # -- same as above but with paging included
-RewriteRule ^([0-9]+)(_[^/]+)\.page\.([1-9]+)$ index.php?blogId=$1&page=$3 [L,NC]
+RewriteRule ^([0-9]+)_[^.]+\.page\.([1-9]+)$ index.php?blogId=$1&page=$2 [L,NC]
 
 # Static Pages (i.e /3_userfoo/demosites)
 RewriteRule ^([0-9]+)_[^/]+/(.+)$ index.php?op=Template&blogId=$1&show=$2 [NC]

Modified: plog/trunk/class/net/rawrequestgenerator.class.php
===================================================================
--- plog/trunk/class/net/rawrequestgenerator.class.php	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/class/net/rawrequestgenerator.class.php	2008-01-02 15:44:48 UTC (rev 6137)
@@ -10,7 +10,7 @@
      * @see RequestGenerator
      * @see BaseRequestGenerator
      */
-    class RawRequestGenerator extends BaseRequestGenerator 
+    class RawRequestGenerator extends BaseRequestGenerator
     {
 
     	/**
@@ -34,7 +34,7 @@
         {
         	$this->_params[$paramName] = $paramValue;
         }
-		
+
         /**
          * @private
          */
@@ -127,10 +127,10 @@
              $this->addParameter( "postCategoryId", $postCategoryIds[0]);
              if( $this->_blogInfo != null )
                $this->addParameter( "blogId", $this->_blogInfo->getId());
- 
+
              //$categoryLink = $_SERVER["PHP_SELF"].$rg->getRequest();
              $categoryLink = $this->getIndexUrl().$this->getRequest();
- 
+
              return $categoryLink;
         }
 
@@ -189,10 +189,10 @@
         	if( $blogInfo == null ) {
 				$blogInfo = $this->_blogInfo;
             }
-			
-			
+
+
 			$this->addParameter( "blogId", $blogInfo->getId());
-			$link = $this->getIndexUrl().$this->getRequest();			
+			$link = $this->getIndexUrl().$this->getRequest();
 
             return $link;
         }
@@ -272,11 +272,11 @@
         }
 
         /**
-         * generates an archive link given a date. 
+         * generates an archive link given a date.
          *
          * @param date A String in the format yyyymm
          * @return A valid archive link
-         */        
+         */
         function getArchiveLink( $date )
         {
         	$this->addParameter( "op", "Default" );
@@ -331,7 +331,7 @@
          * a valid URL.
          *
          * @param album The album
-         */                                
+         */
         function parentAlbumLink( $album )
         {
         	$this->addParameter( "op", "ViewAlbum" );
@@ -344,11 +344,11 @@
         }
 
         /**
-         * Given the name of a template file, generate the right link to it. 
+         * Given the name of a template file, generate the right link to it.
          *
          * @param template
          * @return A link to the given template file/static page
-         */        
+         */
         function templatePage( $template )
         {
         	$this->addParameter( "op", "Template" );
@@ -368,7 +368,7 @@
         function resourceLink( $resource )
         {
             $blogId = ($resource->getOwnerId() ? $resource->getOwnerId() : $this->_blogInfo->getId());
-            
+
             $this->addParameter( "op", "ViewResource" );
             $this->addParameter( "blogId", $blogId);
             $this->addParameter( "resource", $resource->getFileName());
@@ -387,11 +387,11 @@
         {
         	$request = "";
 
-			if( $this->isXHTML()) 
+			if( $this->isXHTML())
 				$amp = "&";
 			else
 				$amp = "&";
-				
+
 			if( !$this->getIncludeBlogId() && $removeBlogIdIfNecessary )
 				$this->removeParameter( "blogId" );
 
@@ -409,7 +409,7 @@
 
             return $request;
         }
-		
+
 		/**
 		 * given the parameters, recalculates the current URL. This method also has support
 		 * for paged urls
@@ -426,25 +426,25 @@
 				$amp = "&";
 			else
 				$amp = "&";
-		
+
 			$url = $this->getIndexUrl()."?op=Default{$amp}blogId=".$this->_blogInfo->getId()."{$amp}";
 			$params = "";
-			
+
 			if( $category )
 				$params .= "postCategoryId=".$category->getId().$amp;
 			if( $userInfo )
 				$params .= "userId=".$userInfo->getId().$amp;
 			if( $date != -1 )
-				$params .= "date=".$date.$amp;
-				
+				$params .= "Date=".$date.$amp;
+
 			if( $params )
 				$url .= $params;
-				
+
 			$url .= $this->getPageSuffix();
-				
+
 			return( $url );
 		}
-		
+
 		/**
 		 * Returns the page format for this URL generator
 		 *
@@ -456,10 +456,10 @@
 				$amp = "&";
 			else
 				$amp = "&";
-				
+
 			$pageFormat = $amp."page=";
-			
+
 			return( $pageFormat );
-		}						
+		}
     }
 ?>

Modified: plog/trunk/install/defaultconfig.properties.php
===================================================================
--- plog/trunk/install/defaultconfig.properties.php	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/install/defaultconfig.properties.php	2008-01-02 15:44:48 UTC (rev 6137)
@@ -128,7 +128,9 @@
 $Inserts['template_load_order']                             = "INSERT INTO {dbprefix}config (config_key, config_value, value_type) VALUES ('template_load_order','2', 1);"; 
 $Inserts['summary_service_name']                            = "INSERT INTO {dbprefix}config (config_key, config_value, value_type) VALUES ('summary_service_name','Your Service Name', 3);"; 
 $Inserts['allow_javascript_blocks_in_posts']                = "INSERT INTO {dbprefix}config (config_key, config_value, value_type) VALUES ('allow_javascript_blocks_in_posts','0', 1);"; 
+$Inserts['trim_whitespace_output']                          = "INSERT INTO {dbprefix}config (config_key, config_value, value_type) VALUES ('trim_whitespace_output','1', 1);"; 
+$Inserts['summary_disable_registration']                    = "INSERT INTO {dbprefix}config (config_key, config_value, value_type) VALUES ('summary_disable_registration','1', 1);";
 $Inserts['location_data_enabled']                           = "INSERT INTO {dbprefix}config (config_key, config_value, value_type) VALUES ('location_data_enabled','0', 1);"; 
 $Inserts['google_maps_api_key']                             = "INSERT INTO {dbprefix}config (config_key, config_value, value_type) VALUES ('google_maps_api_key','', 3);"; 
-$Inserts['trim_whitespace_output']                             = "INSERT INTO {dbprefix}config (config_key, config_value, value_type) VALUES ('trim_whitespace_output','1', 1);"; 
-?>
+
+?>
\ No newline at end of file

Modified: plog/trunk/locale/admin/locale_de_DE.php
===================================================================
--- plog/trunk/locale/admin/locale_de_DE.php	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/locale/admin/locale_de_DE.php	2008-01-02 15:44:48 UTC (rev 6137)
@@ -601,7 +601,7 @@
 $messages['help_force_one_blog_per_email_account'] = 'Begrenzung auf maximal ein Blog pro E-Mail Account [Standard = Nein]';
 $messages['help_summary_show_agreement'] = 'Nutzungsvereinbarung anzeigen und von neuen Benutzern akzeptieren lassen, bevor die Registrierung abgeschlossen wird [Standard = Ja]';
 $messages['help_need_email_confirm_registration'] = 'Neue Benutzer zwingen, Ihre Registrierung über das Klicken eines Links zu bestätigen, der Ihnen per E-Mail an Ihren Account gesendet wird. [Standard = Ja]';
-$messages['help_summary_disable_registration'] = 'Benutzern verbieten, neue Blogs zu registrieren [Standard = Nein]';
+$messages['help_summary_disable_registration'] = 'Benutzern verbieten, neue Blogs zu registrieren [Standard = Ja]';
 // templates
 $messages['help_template_folder'] = 'Verzeichnis, in dem Templates gespeichert werden [Standard = ./templates]';
 $messages['help_default_template'] = 'Standardtemplate für neue Blogs [Standard = standard]';

Modified: plog/trunk/locale/admin/locale_en_UK.php
===================================================================
--- plog/trunk/locale/admin/locale_en_UK.php	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/locale/admin/locale_en_UK.php	2008-01-02 15:44:48 UTC (rev 6137)
@@ -586,7 +586,7 @@
 $messages['help_force_one_blog_per_email_account'] = 'Restrict to only one blog per email account. [Default = No]';
 $messages['help_summary_show_agreement'] = 'Show an agreement text and make users accept it before proceeding to the registration process. [Default = Yes]';
 $messages['help_need_email_confirm_registration'] = 'Force users to confirm their registration by clicking a link embedded in an email sent to their account. [Default = Yes]';
-$messages['help_summary_disable_registration'] = 'Disable users registration of new blogs in this site. [Default = No]';
+$messages['help_summary_disable_registration'] = 'Disable users registration of new blogs in this site. [Default = Yes]';
 // templates
 $messages['help_template_folder'] = 'Folder where templates are stored. [Default = ./templates]';
 $messages['help_default_template'] = 'Default template for new blogs. [Default = standard]';

Modified: plog/trunk/locale/admin/locale_es_ES.php
===================================================================
--- plog/trunk/locale/admin/locale_es_ES.php	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/locale/admin/locale_es_ES.php	2008-01-02 15:44:48 UTC (rev 6137)
@@ -592,7 +592,7 @@
 $messages['help_force_one_blog_per_email_account'] = 'No permitir más de una bitácora por dirección de correo [Valor por defecto = No]';
 $messages['help_summary_show_agreement'] = 'Mostrar un texto/licencia con el cual los usuarios tienen que estar de acuerdo antes de continuar con el proceso de registro [Valor por defecto = Sí]';
 $messages['help_need_email_confirm_registration'] = 'Enviar un email a los nuevos usuarios con un enlace al que tienen que acceder, para confirmar el registro de una nueva bitácora [Valor por defecto = Sí]';
-$messages['help_summary_disable_registration'] = 'No permitir el registro de nuevas bitácoras [Valor por defecto = No]';
+$messages['help_summary_disable_registration'] = 'No permitir el registro de nuevas bitácoras [Valor por defecto = Sí]';
 // templates
 $messages['help_template_folder'] = 'Carpeta donde se guardan las plantillas [Valor por defecto = ./templates]';
 $messages['help_default_template'] = 'Plantilla por defecto para las nuevas bitácoras [Valor por defecto = standard]';
@@ -1203,11 +1203,11 @@
 
 /// new strings for LT 1.2.5 ///
 $messages['bookmark_this_filter'] = 'Guardar este filtro';
-$messages['help_trim_whitespace_output'] = 'Elimina espacios en blanco innecesarios de las páginas generadas por Lifetype. Es recomendable activar esta opción para ahorrar ancho de banda, ya que se pueden llegar a conseguir páginas hasta un 40% más pequeñas';
+$messages['help_trim_whitespace_output'] = 'Elimina espacios en blanco innecesarios de las p঩nas generadas por Lifetype. Es recomendable activar esta opci򬟰ara ahorrar ancho de banda, ya que se pueden llegar a conseguir p঩nas hasta un 40% mౠpeque𠱧;
 $messages['help_notify_new_blogs'] = 'Informar al administrador de este servidor cada vez que se registre un nuevo blog en el sistema';
-$messages['new_blog_admin_notification_text'] = 'Éste es un mensaje enviado por Lifetype.
+$messages['new_blog_admin_notification_text'] = 'ȳte es un mensaje enviado por Lifetype.
 
-Se ha registrado una nueva bitácosa llamado "%1$s" (%2$s) en su servidor.
+Se ha registrado una nueva bitࢯsa llamado "%1$s" (%2$s) en su servidor.
 
 Saludos.
 ';

Modified: plog/trunk/locale/admin/locale_fr_FR.php
===================================================================
--- plog/trunk/locale/admin/locale_fr_FR.php	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/locale/admin/locale_fr_FR.php	2008-01-02 15:44:48 UTC (rev 6137)
@@ -519,7 +519,7 @@
 $messages['help_force_one_blog_per_email_account'] = 'Restreindre à seulement un blog par adresse électronique. [Défaut : Non]';
 $messages['help_summary_show_agreement'] = 'Afficher un message d’avertissement et demander l’acceptation aux utilisateurs qui s’inscrivent. [Défaut : Oui]';
 $messages['help_need_email_confirm_registration'] = 'Obliger les utilisateurs à  confirmer leur inscription en cliquant sur un lien envoyé par courriel (recommandé). [Défaut : Oui]';
-$messages['help_summary_disable_registration'] = 'Désactiver l’inscription à de nouveaux blogs sur ce site. [Défaut : Non]';
+$messages['help_summary_disable_registration'] = 'Désactiver l’inscription à de nouveaux blogs sur ce site. [Défaut : Oui]';
 $messages['help_template_folder'] = 'Dossier où sont stockés les gabarits. [Défaut : ./templates]';
 $messages['help_default_template'] = 'Gabarit par défaut des nouveaux blogs. [Défaut : standard]';
 $messages['help_users_can_add_templates'] = 'Autoriser les utilisateurs à téléverser leurs propres gabarits. [Défaut : Oui]';
@@ -1003,4 +1003,4 @@
 
 Bonne journée.
 ';
-?>
\ No newline at end of file
+?>

Modified: plog/trunk/locale/admin/locale_gl_ES.php
===================================================================
--- plog/trunk/locale/admin/locale_gl_ES.php	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/locale/admin/locale_gl_ES.php	2008-01-02 15:44:48 UTC (rev 6137)
@@ -595,7 +595,7 @@
 $messages['help_force_one_blog_per_email_account'] = 'Non permitir máis dunha bitácora por enderezo de correo [Valor por defecto = Non]';
 $messages['help_summary_show_agreement'] = 'Amosar un texto/licencia coa que os usuarios teñen que estar de acordo antes de continuar co proceso de rexistro [Valor por defecto = Sí]';
 $messages['help_need_email_confirm_registration'] = 'Enviar un email os novos usuarios cun enlace o que teñen que acceder, para confirma-lo rexistro dunha nova bitácora [Valor por defecto = Sí]';
-$messages['help_summary_disable_registration'] = 'Non permiti-lo rexistro de novas bitácoras [Valor por defecto = Non]';
+$messages['help_summary_disable_registration'] = 'Non permiti-lo rexistro de novas bitácoras [Valor por defecto = Sí]';
 // templates
 $messages['help_template_folder'] = 'Cartafol onde se gardan as plantillas [Valor por defecto = ./templates]';
 $messages['help_default_template'] = 'Plantilla por defecto para as novas bitácoras [Valor por defecto = standard]';
@@ -1200,11 +1200,11 @@
 $messages['all_files_ok'] = 'Tódolos ficheiros son correctos';
 
 /// new strings for LT 1.2.4 ///
-$messages['plugin_latest_version'] = 'Última version dispoñible: ';
+$messages['plugin_latest_version'] = '٬tima version dispo𨡬e: ';
 $messages['check_versions'] = 'Comprobar versions';
-$messages['lt_version_ok'] = 'A versión actual de Lifetype é a máis recente.';
-$messages['lt_version_error'] = 'A última versión dispoñible de Lifetype é: ';
-$messages['release_notes'] = 'Notas da versión';
+$messages['lt_version_ok'] = 'A versi򬟡ctual de Lifetype 矡 mਲ਼ recente.';
+$messages['lt_version_error'] = 'A �a versiò¬Ÿ¤ispo𨡬e de Lifetype ç¸ ';
+$messages['release_notes'] = 'Notas da versi򬥻
 $messages['kb'] = 'Kb';
 $messages['mb'] = 'Mb';
 $messages['gb'] = 'Xb';
@@ -1212,12 +1212,12 @@
 
 /// new strings for LT 1.2.5 ///
 $messages['bookmark_this_filter'] = 'Gardar este filtro';
-$messages['help_trim_whitespace_output'] = 'Elimina espazos en branco innecesarios das páxinas xeradas por Lifetype. E recomendable activar esta opción para aforrar ancho de banda, xa que se poden chegar a conseguir páxinas ata un 40% máis pequenas'; 
-$messages['help_notify_new_blogs'] = 'Informar ó administrador deste servidor cada vez que se rexistre un novo blog no sistema';
-$messages['new_blog_admin_notification_text'] = 'Éste e un mensaxe enviado por Lifetype. 
+$messages['help_trim_whitespace_output'] = 'Elimina espazos en branco innecesarios das p෩nas xeradas por Lifetype. E recomendable activar esta opci򬟰ara aforrar ancho de banda, xa que se poden chegar a conseguir p෩nas ata un 40% mਲ਼ pequenas'; 
+$messages['help_notify_new_blogs'] = 'Informar ñŸ ¤ministrador deste servidor cada vez que se rexistre un novo blog no sistema';
+$messages['new_blog_admin_notification_text'] = 'ȳte e un mensaxe enviado por Lifetype. 
 
-Rexistrouse unha nova bitácora chamada "%1$s" (%2$s) no seu servidor.
+Rexistrouse unha nova bitࢯra chamada "%1$s" (%2$s) no seu servidor.
 
-Saúdos.
+Sa�
 ';
 ?>
\ No newline at end of file

Modified: plog/trunk/locale/admin/locale_hu_HU.php
===================================================================
--- plog/trunk/locale/admin/locale_hu_HU.php	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/locale/admin/locale_hu_HU.php	2008-01-02 15:44:48 UTC (rev 6137)
@@ -601,7 +601,7 @@
 $messages['help_force_one_blog_per_email_account'] = 'Restrict to only one blog per email account. [Default = No]';
 $messages['help_summary_show_agreement'] = 'Show an agreement text and make users accept it before proceeding to the registration process. [Default = Yes]';
 $messages['help_need_email_confirm_registration'] = 'Force users to confirm their registration by clicking a link embedded in an email sent to their account. [Default = Yes]';
-$messages['help_summary_disable_registration'] = 'Disable users registration of new blogs in this site. [Default = No]';
+$messages['help_summary_disable_registration'] = 'Disable users registration of new blogs in this site. [Default = Yes]';
 // templates
 $messages['help_template_folder'] = 'Folder where templates are stored. [Default = ./templates]';
 $messages['help_default_template'] = 'Default template for new blogs. [Default = standard]';
@@ -1199,4 +1199,4 @@
 
 Have a nice day.
 ';
-?>
\ No newline at end of file
+?>

Modified: plog/trunk/locale/admin/locale_it_IT.php
===================================================================
--- plog/trunk/locale/admin/locale_it_IT.php	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/locale/admin/locale_it_IT.php	2008-01-02 15:44:48 UTC (rev 6137)
@@ -599,7 +599,7 @@
 $messages['help_force_one_blog_per_email_account'] = 'Permetti solo un blog per indirizzo email [Predefinito = No]';
 $messages['help_summary_show_agreement'] = 'Mostra agli utenti un testo con le condizioni da accettare prima di completare il processo di registrazione [Predefinito = Sì]';
 $messages['help_need_email_confirm_registration'] = 'Obbliga gli utenti a confermare la loro registrazione, cliccando un link contenuto in un messaggio email inviato al loro account [Predefinito = Sì]';
-$messages['help_summary_disable_registration'] = 'Disabilita la possibilità di registrare nuovi blog in questo sito [Predefinito = No]';
+$messages['help_summary_disable_registration'] = 'Disabilita la possibilità di registrare nuovi blog in questo sito [Predefinito = Sì]';
 // templates
 $messages['help_template_folder'] = 'Cartella dove vengono salvati gli stili [Predefinito = ./templates]';
 $messages['help_default_template'] = 'Stile predefinito per i nuovi blog [Predefinito = standard]';
@@ -1177,10 +1177,10 @@
 $messages['all_files_ok'] = 'Tutti i file sono corretti';
 
 /// new strings for LT 1.2.4 ///
-$messages['plugin_latest_version'] = 'Versione più recente disponibile: ';
+$messages['plugin_latest_version'] = 'Versione pi�ente disponibile: ';
 $messages['check_versions'] = 'Controlla versioni';
-$messages['lt_version_ok'] = 'La versione corrente di Lifetype è aggiornata.';
-$messages['lt_version_error'] = 'La versione più recente di Lifetype è: ';
+$messages['lt_version_ok'] = 'La versione corrente di Lifetype 柡ggiornata.';
+$messages['lt_version_error'] = 'La versione pi�ente di Lifetype æ¸ ';
 $messages['release_notes'] = 'Note di rilascio';
 
 $messages['kb'] = 'KB';
@@ -1190,11 +1190,11 @@
 
 /// new strings for LT 1.2.5 ///
 $messages['bookmark_this_filter'] = 'Annota questo filtro';
-$messages['help_trim_whitespace_output'] = 'Rimuovi tutti gli spazi bianchi non necessari dai template, può ridurre la dimensione delle pagine del 40%. E\' consigliabili di mantenere questa opzione abilitata, disattivala solo per guadagnare in prestazioni [ Predefinito = Si ]';
+$messages['help_trim_whitespace_output'] = 'Rimuovi tutti gli spazi bianchi non necessari dai template, pu🱩durre la dimensione delle pagine del 40%. E\' consigliabili di mantenere questa opzione abilitata, disattivala solo per guadagnare in prestazioni [ Predefinito = Si ]';
 $messages['help_notify_new_blogs'] = 'Notifica l\'amministratore del sito ogni volta che viene creato un nuovo blog';
-$messages['new_blog_admin_notification_text'] = 'Questo è il sistema di notifica automatica di LifeType.
+$messages['new_blog_admin_notification_text'] = 'Questo 柩l sistema di notifica automatica di LifeType.
 
-Un nuovo blog di nome "%1$s" (%2$s) è stato creato.
+Un nuovo blog di nome "%1$s" (%2$s) 柳tato creato.
 
 Buona giornata.
 ';

Modified: plog/trunk/locale/admin/locale_ru_RU.php
===================================================================
--- plog/trunk/locale/admin/locale_ru_RU.php	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/locale/admin/locale_ru_RU.php	2008-01-02 15:44:48 UTC (rev 6137)
@@ -605,7 +605,7 @@
 $messages['help_force_one_blog_per_email_account'] = 'Ограничить до одного блога на адрес электронной почты [По умолчанию = Нет]';
 $messages['help_summary_show_agreement'] = 'Показывать текст соглашения и принимать согласие пользователей, прежде чем приступить к регистрации [По умолчанию = Да]';
 $messages['help_need_email_confirm_registration'] = 'Обязывать пользователей подтверждать их регистрацию переходом на сайт с ссылки, высланной письмом на их адрес электронной почты [По умолчанию = Да]';
-$messages['help_summary_disable_registration'] = 'Отключить регистрацию пользователей для создания новых блогов на этом сайте [По умолчанию = Нет]';
+$messages['help_summary_disable_registration'] = 'Отключить регистрацию пользователей для создания новых блогов на этом сайте [По умолчанию = Да]';
 
 // templates
 $messages['help_template_folder'] = 'Директория хранения шаблонов [По умолчанию = ./templates]';

Modified: plog/trunk/locale/admin/locale_tt_RU.php
===================================================================
--- plog/trunk/locale/admin/locale_tt_RU.php	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/locale/admin/locale_tt_RU.php	2008-01-02 15:44:48 UTC (rev 6137)
@@ -605,7 +605,7 @@
 $messages['help_force_one_blog_per_email_account'] = 'Электрон почта адресына туры килүче блог санын бергә кадәр киметергә [Килешү буенча = Юк]';
 $messages['help_summary_show_agreement'] = 'Теркәлер алдыннан Килешү текстын күрсәтү һәм кулланучыларның ризалыгын алу [Килешү буенча = Әйе]';
 $messages['help_need_email_confirm_registration'] = 'Кулланучылардан электрон почта адресына җибәрелгән хаттагы сылтама аша сайтка күчеп теркәүне раслауны таләп итү [Килешү буенча = Әйе]';
-$messages['help_summary_disable_registration'] = 'Бу сайтта яңа блог төзергә теләгән кулланучыларны теркәүне өзеп кую [Килешү буенча = Юк]';
+$messages['help_summary_disable_registration'] = 'Бу сайтта яңа блог төзергә теләгән кулланучыларны теркәүне өзеп кую [Килешү буенча = Әйе]';
 
 // шаблоннар
 $messages['help_template_folder'] = 'Шаблоннарны саклау папкасы [Килешү буенча = ./templates]';
@@ -1187,4 +1187,4 @@
 
 Уңышлар!
 ';
-?>
\ No newline at end of file
+?>

Modified: plog/trunk/locale/admin/locale_vi_VN.php
===================================================================
--- plog/trunk/locale/admin/locale_vi_VN.php	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/locale/admin/locale_vi_VN.php	2008-01-02 15:44:48 UTC (rev 6137)
@@ -601,7 +601,7 @@
 $messages['help_force_one_blog_per_email_account'] = 'RGiới hạn mỗi blog chỉ có một tài khoản thư điện tử. [Mặc định = Không]';
 $messages['help_summary_show_agreement'] = 'Hiển thị bản quy định chung của hệ thống và người dùng bắt buộc phải đồng ý các quy định nếu muốn tiếp tục đăng ký tham gia hệ thống. [Mặc định = Đồng ý]';
 $messages['help_need_email_confirm_registration'] = 'Buộc người dùng kích hoạt tài khoản thông qua thư điện tử. [Mặc định = Đồng ý]';
-$messages['help_summary_disable_registration'] = 'Vô hiệu hóa chức năng đăng ký tạo blog mới trên hệ thống này. [Default = No]';
+$messages['help_summary_disable_registration'] = 'Vô hiệu hóa chức năng đăng ký tạo blog mới trên hệ thống này. [Mặc định = Đồng ý]';
 // templates
 $messages['help_template_folder'] = 'Thư mục lưu trữ giao diện. [Mặc định = ./templates]';
 $messages['help_default_template'] = 'Giao diện mặc định cho blog. [Mặc định = standard]';
@@ -1191,4 +1191,4 @@
 /// new strings for LT 1.2.5 ///
 $messages['bookmark_this_filter'] = 'Đánh dấu bộ lọc này';
 $messages['help_trim_whitespace_output'] = 'Xóa tất cả các khoảng trống từ giao diện được sinh ra, nó có thể làm giảm 40% dung lượng. Đấy có thể là một lời khuyên cho bạn, ngoài trừ việc bạn không quan tâm đến việc thực hiện [ Mặc định = Đồng ý ]';
-?>
\ No newline at end of file
+?>

Modified: plog/trunk/locale/admin/locale_zh_CN.php
===================================================================
--- plog/trunk/locale/admin/locale_zh_CN.php	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/locale/admin/locale_zh_CN.php	2008-01-02 15:44:48 UTC (rev 6137)
@@ -601,7 +601,7 @@
 $messages['help_force_one_blog_per_email_account'] = '一个电子邮件是否只能注册一个博客';
 $messages['help_summary_show_agreement'] = '在用户进行注册动作之前，是否显示并确认用户同意服务条款。';
 $messages['help_need_email_confirm_registration'] = '是否启用电子邮件的确认链接来启用帐号。';
-$messages['help_summary_disable_registration'] = '是否关闭用户注册新博客的功能。';
+$messages['help_summary_disable_registration'] = '是否关闭用户注册新博客的功能。[默认值 = 是]';
 // templates
 $messages['help_template_folder'] = '模版文件的所在目录路径。';
 $messages['help_default_template'] = '在新建博客站台时，默认使用的模版。';

Modified: plog/trunk/locale/admin/locale_zh_TW.php
===================================================================
--- plog/trunk/locale/admin/locale_zh_TW.php	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/locale/admin/locale_zh_TW.php	2008-01-02 15:44:48 UTC (rev 6137)
@@ -601,7 +601,7 @@
 $messages['help_force_one_blog_per_email_account'] = '一個電子郵件是否只能註冊一個網誌';
 $messages['help_summary_show_agreement'] = '在使用者進行註冊動作之前，是否顯示並確認使用者同意服務條款。';
 $messages['help_need_email_confirm_registration'] = '是否啟用電子郵件的確認連結來啟用帳號。';
-$messages['help_summary_disable_registration'] = '是否關閉使用者註冊新網誌的功能。';
+$messages['help_summary_disable_registration'] = '是否關閉使用者註冊新網誌的功能。[é è¨­å€¼ = 是]';
 // templates
 $messages['help_template_folder'] = '模版檔案的所在目錄路徑。';
 $messages['help_default_template'] = 'åœ¨æ–°å»ºç¶²èªŒç«™å°æ™‚ï¼Œé è¨­ä½¿ç”¨çš„æ¨¡ç‰ˆã€‚';

Modified: plog/trunk/templates/LifeType/header.template
===================================================================
--- plog/trunk/templates/LifeType/header.template	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/templates/LifeType/header.template	2008-01-02 15:44:48 UTC (rev 6137)
@@ -31,6 +31,6 @@
 </div>
 <table>
 <tr>
-<td colspan="3" style="border:0px;width:750px;padding:0px;"><a href="{$url->blogLink()}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image10','','{$url->getTemplateFile("$lang/news-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/news.jpg")}" width="118" height="35" alt="News" /></a><a href="{$url->templatePage("features")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image11','','{$url->getTemplateFile("$lang/features-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/features.jpg")}" width="126" height="35" alt="Features" /></a><a href="{$url->templatePage("downloads")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image12','','{$url->getTemplateFile("$lang/downloads-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/downloads.jpg")}" alt="Downloads" width="118" height="35" /></a><a href="{$url->templatePage("development")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image13','','{$url->getTempla
 teFile("$lang/development-on.jpg")}',1)"><img alt="Development" src="{$url->getTemplateFile("$lang/development.jpg")}" width="148" height="35" /></a><a href="{$url->templatePage("support")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image14','','{$url->getTemplateFile("$lang/support-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/support.jpg")}" alt="Support" width="121" height="35" /></a><a href="{$url->templatePage("aboutus")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image15','','{$url->getTemplateFile("$lang/aboutus-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/aboutus")}.jpg" alt="About Us" width="119" height="35" /></a></td>
+<td colspan="3" style="border:0px;width:750px;padding:0px;"><a href="{$url->blogLink()}blog" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image10','','{$url->getTemplateFile("$lang/news-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/news.jpg")}" width="118" height="35" alt="News" /></a><a href="{$url->templatePage("features")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image11','','{$url->getTemplateFile("$lang/features-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/features.jpg")}" width="126" height="35" alt="Features" /></a><a href="{$url->templatePage("downloads")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image12','','{$url->getTemplateFile("$lang/downloads-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/downloads.jpg")}" alt="Downloads" width="118" height="35" /></a><a href="{$url->templatePage("development")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image13','','{$url->getTe
 mplateFile("$lang/development-on.jpg")}',1)"><img alt="Development" src="{$url->getTemplateFile("$lang/development.jpg")}" width="148" height="35" /></a><a href="{$url->templatePage("support")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image14','','{$url->getTemplateFile("$lang/support-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/support.jpg")}" alt="Support" width="121" height="35" /></a><a href="{$url->templatePage("aboutus")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image15','','{$url->getTemplateFile("$lang/aboutus-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/aboutus")}.jpg" alt="About Us" width="119" height="35" /></a></td>
 </tr>
 </table>

Modified: plog/trunk/templates/LifeType/headermain.template
===================================================================
--- plog/trunk/templates/LifeType/headermain.template	2008-01-02 15:32:16 UTC (rev 6136)
+++ plog/trunk/templates/LifeType/headermain.template	2008-01-02 15:44:48 UTC (rev 6137)
@@ -67,5 +67,5 @@
 			</tr>
 
 	<tr>
-				<td colspan="3" style="border:0px;width:750px;padding:0px;"><a href="{$url->blogLink()}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image10','','{$url->getTemplateFile("$lang/news-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/news.jpg")}" width="118" height="35" alt={$locale->tr("News")} /></a><a href="{$url->templatePage("features")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image11','','{$url->getTemplateFile("$lang/features-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/features.jpg")}" width="126" height="35" alt={$locale->tr("Features")} /></a><a href="{$url->templatePage("downloads")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image12','','{$url->getTemplateFile("$lang/downloads-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/downloads.jpg")}" alt={$locale->tr("Downloads")} width="118" height="35" /></a><a href="{$url->templatePage("development")}" onmouseout="MM_swapImgRestore()" onmouse
 over="MM_swapImage('Image13','','{$url->getTemplateFile("$lang/development-on.jpg")}',1)"><img alt={$locale->tr("Development")} src="{$url->getTemplateFile("$lang/development.jpg")}" width="148" height="35" /></a><a href="{$url->templatePage("support")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image14','','{$url->getTemplateFile("$lang/support-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/support.jpg")}" alt={$locale->tr("Support")} width="121" height="35" /></a><a href="{$url->templatePage("aboutus")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image15','','{$url->getTemplateFile("$lang/aboutus-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/aboutus")}.jpg" alt="{$locale->tr("About Us")}" width="119" height="35" /></a></td>
+				<td colspan="3" style="border:0px;width:750px;padding:0px;"><a href="{$url->blogLink()}blog" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image10','','{$url->getTemplateFile("$lang/news-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/news.jpg")}" width="118" height="35" alt={$locale->tr("News")} /></a><a href="{$url->templatePage("features")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image11','','{$url->getTemplateFile("$lang/features-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/features.jpg")}" width="126" height="35" alt={$locale->tr("Features")} /></a><a href="{$url->templatePage("downloads")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image12','','{$url->getTemplateFile("$lang/downloads-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/downloads.jpg")}" alt={$locale->tr("Downloads")} width="118" height="35" /></a><a href="{$url->templatePage("development")}" onmouseout="MM_swapImgRestore()" onm
 ouseover="MM_swapImage('Image13','','{$url->getTemplateFile("$lang/development-on.jpg")}',1)"><img alt={$locale->tr("Development")} src="{$url->getTemplateFile("$lang/development.jpg")}" width="148" height="35" /></a><a href="{$url->templatePage("support")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image14','','{$url->getTemplateFile("$lang/support-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/support.jpg")}" alt={$locale->tr("Support")} width="121" height="35" /></a><a href="{$url->templatePage("aboutus")}" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image15','','{$url->getTemplateFile("$lang/aboutus-on.jpg")}',1)"><img src="{$url->getTemplateFile("$lang/aboutus")}.jpg" alt="{$locale->tr("About Us")}" width="119" height="35" /></a></td>
         </tr>