Changeset 4991

Timestamp:

11/06/09 01:35:55 (3 weeks ago)

Author:

fumiakiy

Message:

Merged RC1 fixes to "trunk". " svn merge -r4973:4989 http://code.sixapart.com/svn/movabletype/branches/greyhound-rc-1 ."

Location:

branches/greyhound

Files:

• index.html (modified) (6 diffs)
• lib/MT.pm (modified) (1 diff)
• lib/MT/BackupRestore.pm (modified) (1 diff)
• lib/MT/BackupRestore/BackupFileHandler.pm (modified) (2 diffs)
• lib/MT/L10N/de.pm (modified) (2 diffs)
• lib/MT/L10N/es.pm (modified) (2 diffs)
• lib/MT/L10N/fr.pm (modified) (2 diffs)
• lib/MT/L10N/ja.pm (modified) (3 diffs)
• lib/MT/L10N/nl.pm (modified) (2 diffs)
• lib/MT/Template/Context.pm (modified) (1 diff)
• lib/MT/Upgrade.pm (modified) (1 diff)
• lib/MT/Upgrade/v3.pm (modified) (1 diff)
• php/lib/block.mtblogifcommentsopen.php (modified) (1 diff)
• php/lib/mtdb.base.php (modified) (1 diff)
• readme.html (modified) (7 diffs)
• tmpl/cms/include/footer.tmpl (modified) (1 diff)
• tmpl/cms/upgrade.tmpl (modified) (1 diff)
• tmpl/cms/widget/new_install.tmpl (modified) (1 diff)
• tmpl/cms/widget/new_user.tmpl (modified) (1 diff)
• tmpl/wizard/configure.tmpl (modified) (1 diff)

branches/greyhound/index.html

@@ -110 +110 @@
                 <div class="login"><a rel="nofollow" href="mt.cgi?__lang=en_US">Sign in to Movable Type</a></div>
                 <h2>Installing?</h2>
-                <p>If you are just starting with Movable Type, you may want to review the installation/upgrade guide posted on the <a href="http://www.movabletype.org/documentation/mt5/">Movable Type documentation site</a> and view the <a rel="nofollow" href="mt-check.cgi?__lang=en_US">Movable Type System Check</a> to make sure that your system has what it needs.</p>
+                <p>If you are just starting with Movable Type, you may want to review the installation/upgrade guide posted on the <a href="http://www.movabletype.org/documentation/">Movable Type documentation site</a> and view the <a rel="nofollow" href="mt-check.cgi?__lang=en_US">Movable Type System Check</a> to make sure that your system has what it needs.</p>
             </div><!-- End English -->
 
@@ -117 +117 @@
                 <div class="login"><a rel="nofollow" href="mt.cgi?__lang=de">Bei Movable Type anmelden</a></div>
                 <h2>Movable Type installieren?</h2>
-                <p>Wenn Sie Movable Type jetzt installieren möchten, lesen Sie bitte die Installationshinweise in der <a href="http://www.movabletype.org/documentation/mt5/">Movable Type-Dokumentation</a> und nutzen Sie die <a rel="nofollow" href="mt-check.cgi?__lang=de">Movable Type-SystemÌberprÌfung</a>,  um Ihren Server automatisch auf die erforderliche Software hin zu ÌberprÌfen.</p>
+                <p>Wenn Sie Movable Type jetzt installieren möchten, lesen Sie bitte die Installationshinweise in der <a href="http://www.movabletype.org/documentation/">Movable Type-Dokumentation</a> und nutzen Sie die <a rel="nofollow" href="mt-check.cgi?__lang=de">Movable Type-SystemÌberprÌfung</a>,  um Ihren Server automatisch auf die erforderliche Software hin zu ÌberprÌfen.</p>
             </div><!-- End German -->
 
@@ -124 +124 @@
                 <div class="login"><a rel="nofollow" href="mt.cgi?__lang=es">Iniciar sesión en Movable Type</a></div>
                 <h2>¿Instalando?</h2>
-                <p>Si acaba de empezar con Movable Type, quizás desee consultar la sección de instalación/actualización de la <a href="http://www.movabletype.org/documentation/mt5/">documentación de Movable Type</a> y ver la <a rel="nofollow" href="mt-check.cgi?__lang=es">comprobación del sistema de Movable Type</a> para segurarse de que su sistema tiene todo lo necesario.</p>
+                <p>Si acaba de empezar con Movable Type, quizás desee consultar la sección de instalación/actualización de la <a href="http://www.movabletype.org/documentation/">documentación de Movable Type</a> y ver la <a rel="nofollow" href="mt-check.cgi?__lang=es">comprobación del sistema de Movable Type</a> para segurarse de que su sistema tiene todo lo necesario.</p>
             </div><!-- End Spanish -->
 
@@ -131 +131 @@
                 <div class="login"><a rel="nofollow" href="mt.cgi?__lang=fr">S'enregistrer dans Movable Type</a></div>
                 <h2>Installation?</h2>
-                <p>Si vous découvrez Movable Type, vous apprécierez certainement de trouver des conseils utiles dans le chapitre "Installation" dans notre <a href="http://www.movabletype.org/documentation/mt5/">documentation Movable Type</a>. Vous pouvez aussi visiter la Page <a rel="nofollow" href="mt-check.cgi?__lang=fr">"Vérification SystÚme"</a> pour vérifier que votre systÚme comporte tous les éléments nécessaires à l'installation de Movable Type.</p>
+                <p>Si vous découvrez Movable Type, vous apprécierez certainement de trouver des conseils utiles dans le chapitre "Installation" dans notre <a href="http://www.movabletype.org/documentation/">documentation Movable Type</a>. Vous pouvez aussi visiter la Page <a rel="nofollow" href="mt-check.cgi?__lang=fr">"Vérification SystÚme"</a> pour vérifier que votre systÚme comporte tous les éléments nécessaires à l'installation de Movable Type.</p>
             </div><!-- End French -->
 
@@ -138 +138 @@
                 <div class="login"><a rel="nofollow" href="mt.cgi?__lang=ja">サむンむン</a></div>
                 <h2>はじめおお䜿いになる方ぞ</h2>
-                <p>Movable Typeをご利甚いただくためには、セットアップを完了しおおかなければなりたせん。<a href="http://www.movabletype.jp/documentation/mt5/">オンラむンドキュメント</a>のむンストヌル、セットアップに関するドキュメントを読み、皌働にå¿
+                <p>Movable Typeをご利甚いただくためには、セットアップを完了しおおかなければなりたせん。<a href="http://www.movabletype.jp/documentation/">オンラむンドキュメント</a>のむンストヌル、セットアップに関するドキュメントを読み、皌働にå¿
 芁な環境を準備しおください。たた、<a rel="nofollow" href="mt-check.cgi?__lang=ja">Movable Type システム・チェック (mt-check.cgi)</a> を実行し、環境が敎ったこずを確認しおください。</p>
                 <p>å¿
@@ -148 +148 @@
                 <div class="login"><a rel="nofollow" href="mt.cgi?__lang=nl">Aanmelden op Movable Type</a></div>
                 <h2>Installatie?</h2>
-                <p>Als u Movable Type aan het installeren bent, is het nuttig om de <a href="http://www.movabletype.org/documentation/mt5/">installatie-instructies</a> te bekijken en om de <a rel="nofollow" href="mt-check.cgi?__lang=nl">Movable Type systeemcontrole</a> uit te voeren om zeker te zijn dat u systeem alles heeft wat nodig is.</p>
+                <p>Als u Movable Type aan het installeren bent, is het nuttig om de <a href="http://www.movabletype.org/documentation/">installatie-instructies</a> te bekijken en om de <a rel="nofollow" href="mt-check.cgi?__lang=nl">Movable Type systeemcontrole</a> uit te voeren om zeker te zijn dat u systeem alles heeft wat nodig is.</p>
             </div><!-- End Dutch -->
 

branches/greyhound/lib/MT.pm

@@ -2862 +2862 @@
     my $url = $pkg->config->HelpURL;
     return $url if defined $url;
-    $url = $pkg->translate('http://www.movabletype.org/documentation/mt5/');
+    $url = $pkg->translate('http://www.movabletype.org/documentation/');
     if ( $append ) {
         $url .= $append;

branches/greyhound/lib/MT/BackupRestore.pm

@@ -631 +631 @@
             # restore userpic association now
             my $new_author = $all_objects->{$key};
-            if ( my $userpic_id = $new_author->userpic_asset_id ) {
-                if ( my $new_asset = $all_objects->{'MT::Asset#' . $userpic_id} ) {
-                    $new_author->userpic_asset_id( $new_asset->id );
+            if ( !$all_objects->{$key}->{no_overwrite} ) {
+                if ( my $userpic_id = $new_author->userpic_asset_id ) {
+                    if ( my $new_asset = $all_objects->{'MT::Asset#' . $userpic_id} ) {
+                        $new_author->userpic_asset_id( $new_asset->id );
+                    }
                 }
             }

branches/greyhound/lib/MT/BackupRestore/BackupFileHandler.pm

@@ -104 +104 @@
                                 category => 'restore',
                             });
-                            $objects->{"$class#" . $column_data{id}} = $obj;
+                            $objects->{"$class#" . $column_data{id}} = $obj; 
+                            $objects->{"$class#" . $column_data{id}}->{no_overwrite} = 1;
                             $self->{current} = $obj;
                             $self->{loaded} = 1;
@@ -120 +121 @@
                             my $old_id = delete $column_data{id};
                             $objects->{"$class#$old_id"} = $obj;
+                            $objects->{"$class#$old_id"}->{no_overwrite} = 1;
+                            delete $column_data{userpic_asset_id}
+                                if exists $column_data{userpic_asset_id};
+
                             my $child_classes = $obj->properties->{child_classes} || {};
                             for my $class (keys %$child_classes) {

branches/greyhound/lib/MT/L10N/de.pm

@@ -2247 +2247 @@
         'Plugin error: [_1] [_2]' => 'Plugin-Fehler: [_1] [_2]',
         'Loading template \'[_1]\' failed.' => 'Die Vorlage \'[_1]\' konnte nicht geladen werden.',
-        'http://www.movabletype.org/documentation/mt5/' => 'http://www.movabletype.org/documentation/mt5/',
+        'http://www.movabletype.org/documentation/' => 'http://www.movabletype.org/documentation/',
         'OpenID' => 'OpenID',
         'LiveJournal' => 'LiveJournal',
@@ -2636 +2636 @@
         'Show Current Settings' => 'Einstellungen anzeigen',
         'Database Type' => 'Datenbanktyp',
-        'http://www.movabletype.org/documentation/mt5/[_1]' => 'http://www.movabletype.org/documentation/mt5/[_1]',
+        'http://www.movabletype.org/documentation/[_1]' => 'http://www.movabletype.org/documentation/[_1]',
         'Is your preferred database not listed? View the <a href="[_1]" target="_blank">Movable Type System Check</a> see if additional modules are necessary.' => 'Wird Ihr Datenbanksystem nicht aufgefÌhrt? FÌhren Sie die <a href="[_1]" target="_blank">Movable Type SystemÌberprÌfung</a> durch, um zu erfahren, ob zusÀtzliche Module erforderlich sind.',
         'Once installed, <a href="javascript:void(0)" onclick="[_1]">click here to refresh this screen</a>.' => 'Klicken Sie nach der Installation <a href="javascript:void(0)" onclick="[_1]">hier, um diese Ansicht zu aktualisieren</a>.',

branches/greyhound/lib/MT/L10N/es.pm

@@ -2245 +2245 @@
         'Plugin error: [_1] [_2]' => 'Error en la extensión: [_1] [_2]',
         'Loading template \'[_1]\' failed.' => 'Fallo cargando la plantilla \'[_1]\'.',
-        'http://www.movabletype.org/documentation/mt5/' => 'http://www.movabletype.org/documentation/mt5/',
+        'http://www.movabletype.org/documentation/' => 'http://www.movabletype.org/documentation/',
         'OpenID' => 'OpenID',
         'LiveJournal' => 'LiveJournal',
@@ -2634 +2634 @@
         'Show Current Settings' => 'Mostrar configuración actual',
         'Database Type' => 'Tipo de base de datos',
-        'http://www.movabletype.org/documentation/mt5/[_1]' => 'http://www.movabletype.org/documentation/mt5/[_1]',
+        'http://www.movabletype.org/documentation/[_1]' => 'http://www.movabletype.org/documentation/[_1]',
         'Is your preferred database not listed? View the <a href="[_1]" target="_blank">Movable Type System Check</a> see if additional modules are necessary.' => '¿Su base de datos preferida no está en la lista? Consulte la <a href="[_1]" target="_blank">Comprobación del Sistema de Movable Type</a> para ver si se necesitan otros módulos.',
         'Once installed, <a href="javascript:void(0)" onclick="[_1]">click here to refresh this screen</a>.' => 'Una vez instalado, haga <a href="javascript:void(0)" onclick="[_1]">clic aquí para recargar esta pantalla</a>.',

branches/greyhound/lib/MT/L10N/fr.pm

@@ -2247 +2247 @@
         'Plugin error: [_1] [_2]' => 'Erreur de Plugin: [_1] [_2]',
         'Loading template \'[_1]\' failed.' => 'Le chargement du template \'[_1]\' a échoué.',
-        'http://www.movabletype.org/documentation/mt5/' => 'http://www.movabletype.org/documentation/mt5/',
+        'http://www.movabletype.org/documentation/' => 'http://www.movabletype.org/documentation/',
         'OpenID' => 'OpenID',
         'LiveJournal' => 'LiveJournal',
@@ -2636 +2636 @@
         'Show Current Settings' => 'Montrer les paramÚtres actuels',
         'Database Type' => 'Type de base de données',
-        'http://www.movabletype.org/documentation/mt5/[_1]' => 'http://www.movabletype.org/documentation/mt5/[_1]',
+        'http://www.movabletype.org/documentation/[_1]' => 'http://www.movabletype.org/documentation/[_1]',
         'Is your preferred database not listed? View the <a href="[_1]" target="_blank">Movable Type System Check</a> see if additional modules are necessary.' => 'Votre base de données préférée n\'est pas listée ? Regardez <a href="[_1]" target="_blank">Movable Type System Check</a> pour voir s\'il y a des modules additionnels nécessaires pour permettre son utilisation.',
         'Once installed, <a href="javascript:void(0)" onclick="[_1]">click here to refresh this screen</a>.' => 'Une fois installé, <a href="javascript:void(0)" onclick="[_1]">cliquez ici pour réactualiser cette page</a>.',

branches/greyhound/lib/MT/L10N/ja.pm

@@ -604 +604 @@
         'Load of blog \'[_1]\' failed: [_2]' => 'ブログ(ID:[_1])をロヌドできたせんでした: [_2]',
         'Loading template \'[_1]\' failed.' => 'テンプレヌト「[_1]」のロヌドに倱敗したした。',
-        'http://www.movabletype.org/documentation/mt5/' => 'http://www.movabletype.jp/documentation/mt5/',
+        'http://www.movabletype.org/documentation/' => 'http://www.movabletype.jp/documentation/',
         'An error occurred: [_1]' => '゚ラヌが発生したした: [_1]',
         'OpenID' => 'OpenID',
@@ -5155 +5155 @@
         'Do you want to proceed with the upgrade anyway?' => 'アップグレヌドを実行したすか?',
         'A new version of Movable Type has been installed.  We\'ll need to complete a few tasks to update your database.' => '新しいバヌゞョンの Movable Type をむンストヌルしたした。デヌタベヌスのアップグレヌドを実行しおください。',
-        'The Movable Type Upgrade Guide can be found <a href=\'[_1]\' target=\'_blank\'>here</a>.' => 'Movable Typeアップグレヌドガむドは<a href=\'http://www.movabletype.jp/documentation/mt5/upgrade/\' target=\'_blank\'>こちらを</a>参ç
+        'The Movable Type Upgrade Guide can be found <a href=\'[_1]\' target=\'_blank\'>here</a>.' => 'Movable Typeアップグレヌドガむドは<a href=\'http://www.movabletype.jp/documentation/upgrade/\' target=\'_blank\'>こちらを</a>参ç
 §ãã さい。',
         'In addition, the following Movable Type components require upgrading or installation:' => 'åŠ ãˆãŠã€ä»¥äž‹ã®ã‚³ãƒ³ãƒãƒŒãƒãƒ³ãƒˆã®ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒŒãƒ‰ã€ãŸãŸã¯ã‚€ãƒ³ã‚¹ãƒˆãƒŒãƒ«ãŒå¿
@@ -5505 +5505 @@
         'Database Type' => 'デヌタベヌスの皮類',
         'Select One...' => '遞択しおください',
-        'http://www.movabletype.org/documentation/mt5/[_1]' => 'http://www.movabletype.jp/documentation/mt5/[_1]',
+        'http://www.movabletype.org/documentation/[_1]' => 'http://www.movabletype.jp/documentation/[_1]',
         'Is your preferred database not listed? View the <a href="[_1]" target="_blank">Movable Type System Check</a> see if additional modules are necessary.' => '<a href="[_1]" target="_blank">Movable Type システムチェック</a>を実行しお、å¿
 芁なモゞュヌルを確認しおください。',

branches/greyhound/lib/MT/L10N/nl.pm

@@ -2262 +2262 @@
         'Plugin error: [_1] [_2]' => 'Plugin fout: [_1] [_2]',
         'Loading template \'[_1]\' failed.' => 'Laden van sjabloon \'[_1]\' mislukt.',
-        'http://www.movabletype.org/documentation/mt5/' => 'http://www.movabletype.org/documentation/mt5/',
+        'http://www.movabletype.org/documentation/' => 'http://www.movabletype.org/documentation/',
         'OpenID' => 'OpenID',
         'LiveJournal' => 'LiveJournal',
@@ -2651 +2651 @@
         'Show Current Settings' => 'Huidige instellingen tonen',
         'Database Type' => 'Databasetype',
-        'http://www.movabletype.org/documentation/mt5/[_1]' => 'http://www.movabletype.org/documentation/mt5/[_1]',
+        'http://www.movabletype.org/documentation/[_1]' => 'http://www.movabletype.org/documentation/[_1]',
         'Is your preferred database not listed? View the <a href="[_1]" target="_blank">Movable Type System Check</a> see if additional modules are necessary.' => 'Staat uw gewenste database er niet bij?  Kijk bij de <a href="[_1]" target="_blank">Movable Type systeemcontrole</a> of er bijkomende modules nodig zijn.',
         'Once installed, <a href="javascript:void(0)" onclick="[_1]">click here to refresh this screen</a>.' => '<a href="javascript:void(0)" onclick="[_1]">Klik hier om dit scherm te vernieuwen</a> zodra de installatie voltooid is.',

branches/greyhound/lib/MT/Template/Context.pm

@@ -365 +365 @@
     # If exclude blogs, set the terms and the NOT arg for load
     # 'All' is not a valid value for exclude_blogs
-    elsif ( $attr->{exclude_blogs} ) {
+    elsif ( $attr->{exclude_blogs} || $attr->{exclude_websites} ) {
         return $ctx->error(MT->translate(
                 "The attribute exclude_blogs cannot take '[_1]' for a value.",

branches/greyhound/lib/MT/Upgrade.pm

@@ -19 +19 @@
 use vars qw(%classes %functions %LegacyPerms $App $DryRun $Installing $SuperUser
             $CLI $MAX_TIME $MAX_ROWS @steps);
+
+sub app {
+    return $App;
+}
+
+sub superuser {
+    return $SuperUser;
+}
 
 sub max_rows {

branches/greyhound/lib/MT/Upgrade/v3.pm

@@ -690 +690 @@
 }
 
+sub core_set_superuser {
+    my $self = shift;
+
+    my $SuperUser = $self->superuser();
+    my $app = $self->app();
+    my $author;
+    if ( ( ref $app ) && ( $app->{author} ) ) {
+        require MT::Author;
+        $self->progress(
+            $self->translate_escape(
+                "Setting your permissions to administrator.")
+        );
+        $author = MT::Author->load( $app->{author}->id );
+    }
+    elsif ($SuperUser) {
+        require MT::Author;
+        $self->progress(
+            $self->translate_escape(
+                "Setting your permissions to administrator.")
+        );
+        $author = MT::Author->load($SuperUser);
+    }
+
+    if ($author) {
+        $author->is_superuser(1);
+        $author->save
+            or return $self->error(
+            $self->translate_escape(
+                "Error saving record: [_1].",
+                $author->errstr
+            )
+            );
+    }
+
+    1;
+}
+
 1;

branches/greyhound/php/lib/block.mtblogifcommentsopen.php

@@ -12 +12 @@
         $blog = $ctx->stash('blog');
         if ($ctx->mt->config('AllowComments') &&
-            (($blog->blog_allow_reg_comments && $blog->blog_commenter_authenticators)
+            (($blog->blog_allow_reg_comments && $blog->remote_auth_token)
              || $blog->blog_allow_unreg_comments))
             $open = 1;

branches/greyhound/php/lib/mtdb.base.php

@@ -81 +81 @@
             unset($args['include_websites']);
             $is_excluded = 0;
-        } elseif (isset($args['exclude_blogs']) || isset($args['exclude_blogs'])) {
+        } elseif (isset($args['exclude_blogs']) || isset($args['exclude_websites'])) {
             $attr = $args['exclude_blogs'];
             $attr or $attr = $args['exclude_websites'];

branches/greyhound/readme.html

@@ -81 +81 @@
 
         <h3>Internal Server Errors</h3>
-        <p>If you receive an "Internal Server Error" message, a configuration change may be required on your web server. Please consult our <a href="http://www.movabletype.org/documentation/mt5/install/">installation guide</a> or search our <a href="http://www.sixapart.com/movabletype/kb/">knowledge base</a> to help resolve this issue.</p>
+        <p>If you receive an "Internal Server Error" message, a configuration change may be required on your web server. Please consult our <a href="http://www.movabletype.org/documentation/installation/">installation guide</a> or search our <a href="http://www.sixapart.com/movabletype/kb/">knowledge base</a> to help resolve this issue.</p>
 
         <h3>Finding more help</h3>
-        <p>Need additional information or support? Check out the <a href="http://www.movabletype.org/documentation/mt5/installation/">Detailed Installation Guide</a>.</p>
+        <p>Need additional information or support? Check out the <a href="http://www.movabletype.org/documentation/installation/">Detailed Installation Guide</a>.</p>
     </div><!-- End English -->
     
@@ -125 +125 @@
 
         <h3>Interne Serverfehler</h3>
-        <p>Kommt es zu internen Serverfehlern ("Error 500 - Internal Server Error") ist ggf. der Webserver anders zu konfigurieren. NÀhere Informationen finden Sie in der <a href="http://www.movabletype.org/documentation/mt5/install/">Installationsanleitung</a> und der <a href="http://www.sixapart.com/movabletype/kb/">Wissensdatenbank</a>.</p>
+        <p>Kommt es zu internen Serverfehlern ("Error 500 - Internal Server Error") ist ggf. der Webserver anders zu konfigurieren. NÀhere Informationen finden Sie in der <a href="http://www.movabletype.org/documentation/installation/">Installationsanleitung</a> und der <a href="http://www.sixapart.com/movabletype/kb/">Wissensdatenbank</a>.</p>
 
         <h3>Weitere Hilfe</h3>
-        <p>Brauchen Sie weitere Informationen oder UnterstÃŒtzung? Rufen Sie bitte unsere <a href="http://www.movabletype.org/documentation/mt5/install/">detaillierte Installationsanleitung </a> auf.</p>
+        <p>Brauchen Sie weitere Informationen oder UnterstÃŒtzung? Rufen Sie bitte unsere <a href="http://www.movabletype.org/documentation/installation/">detaillierte Installationsanleitung </a> auf.</p>
     </div><!-- End German -->
     
@@ -168 +168 @@
 
         <h3>Errores internos del servidor</h3>
-        <p>Si obtiene un mensaje de error interno del servidor ("Internal Server Error"), quizás el servidor web necesite cambios en la configuración. Por favor, consulte nuestra <a href="http://www.movabletype.org/documentation/mt5/install/">guía de instalación</a> para ayudarle a resolver este asunto, o consulte nuestra <a href="http://www.sixapart.com/movabletype/kb/">base de conocimiento</a>.</p>
+        <p>Si obtiene un mensaje de error interno del servidor ("Internal Server Error"), quizás el servidor web necesite cambios en la configuración. Por favor, consulte nuestra <a href="http://www.movabletype.org/documentation/installation/">guía de instalación</a> para ayudarle a resolver este asunto, o consulte nuestra <a href="http://www.sixapart.com/movabletype/kb/">base de conocimiento</a>.</p>
 
         <h3>Buscando más ayuda</h3>
-        <p>¿Necesita información o soporte adicional? Consulte nuestra <a href="http://www.movabletype.org/documentation/mt5/install/">Guía Detallada de Instalación</a>.</p>
+        <p>¿Necesita información o soporte adicional? Consulte nuestra <a href="http://www.movabletype.org/documentation/installation/">Guía Detallada de Instalación</a>.</p>
     </div><!-- End Spanish -->
     
@@ -211 +211 @@
 
         <h3>Erreurs internes de serveur</h3>
-        <p>Si vous recevez un message "Internal Server Error", un changement de configuration peut être nécessaire sur votre serveur. Merci de consulter notre <a href="http://www.movabletype.org/documentation/mt5/install/">guide d'installation</a> pour vous aider à résoudre ce problÚme, ou recherchez dans notre <a href="http://www.sixapart.com/movabletype/kb/">base de connaissance</a>.</p>
+        <p>Si vous recevez un message "Internal Server Error", un changement de configuration peut être nécessaire sur votre serveur. Merci de consulter notre <a href="http://www.movabletype.org/documentation/installation/">guide d'installation</a> pour vous aider à résoudre ce problÚme, ou recherchez dans notre <a href="http://www.sixapart.com/movabletype/kb/">base de connaissance</a>.</p>
 
         <h3>Trouver plus d'aide</h3>
-        <p>Vous avez besoin d'informations supplémentaires ou de support ? Lisez le <a href="http://www.movabletype.org/documentation/mt5/install/">Guide d'installation détaillé</a>.</p>
+        <p>Vous avez besoin d'informations supplémentaires ou de support ? Lisez le <a href="http://www.movabletype.org/documentation/installation/">Guide d'installation détaillé</a>.</p>
     </div><!-- End French -->
     
@@ -244 +244 @@
 ‹ã«åŸ©å
 ƒã™ã‚‹ãŸã‚ã«å¿
-芁です。Movable Typeã®ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒŒãƒ‰ã¯ã€ä»¥å‰ã®ãƒãƒŒã‚žãƒ§ãƒ³ã‚’äžŠæ›žãã™ã‚‹æ–¹æ³•ãšã€åˆ¥ãƒ•ã‚©ãƒ«ãƒ€ã«ã‚¢ãƒƒãƒ—ãƒ­ãƒŒãƒ‰ã™ã‚‹æ–¹æ³•ãŒã‚ã‚ŠãŸã™ã€‚ã„ãšã‚Œã®å Žåˆã‚‚ã€ã‚¢ãƒƒãƒ—ãƒ­ãƒŒãƒ‰ã—ãŸãƒ•ã‚©ãƒ«ãƒ€ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ãšã€Movable Typeは自動的にアップグレヌドを開始したす。詳しくは、<a href="http://www.movabletype.jp/documentation/mt5/upgrade/">アップグレヌド・ガむド</a>をご芧ください。</p>
+芁です。Movable Typeã®ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒŒãƒ‰ã¯ã€ä»¥å‰ã®ãƒãƒŒã‚žãƒ§ãƒ³ã‚’äžŠæ›žãã™ã‚‹æ–¹æ³•ãšã€åˆ¥ãƒ•ã‚©ãƒ«ãƒ€ã«ã‚¢ãƒƒãƒ—ãƒ­ãƒŒãƒ‰ã™ã‚‹æ–¹æ³•ãŒã‚ã‚ŠãŸã™ã€‚ã„ãšã‚Œã®å Žåˆã‚‚ã€ã‚¢ãƒƒãƒ—ãƒ­ãƒŒãƒ‰ã—ãŸãƒ•ã‚©ãƒ«ãƒ€ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ãšã€Movable Typeは自動的にアップグレヌドを開始したす。詳しくは、<a href="http://www.movabletype.jp/documentation/upgrade/">アップグレヌド・ガむド</a>をご芧ください。</p>
 
         <h2>Movable Type のむンストヌル</h2>
@@ -265 +265 @@
         <h3>Internal Server Error</h3>
         <p>"Internal Server Error"ãšã„ã†ãƒ¡ãƒƒã‚»ãƒŒã‚žãŒå‡ºãŸå Žåˆã¯ã€Webサヌバヌ䞊で蚭定を倉曎するå¿
-芁があるかもしれたせん。<a href="http://www.movabletype.jp/documentation/mt5/install/">むンストヌルガむド</a>に沿っおむンストヌルを行っおください。たた<a href="http://www.movabletype.jp/faq/">FAQ</a>もご確認ください。</p>
+芁があるかもしれたせん。<a href="http://www.movabletype.jp/documentation/installation/">むンストヌルガむド</a>に沿っおむンストヌルを行っおください。たた<a href="http://www.movabletype.jp/faq/">FAQ</a>もご確認ください。</p>
 
         <h3>その他</h3>
         <p>より詳しいæƒ
-å ±ã¯<a href="http://www.movabletype.jp/documentation/mt5/install/">むンストヌルガむド</a>に掲茉しおいたす。ご確認ください。</p>
+å ±ã¯<a href="http://www.movabletype.jp/documentation/installation/">むンストヌルガむド</a>に掲茉しおいたす。ご確認ください。</p>
     </div><!-- End Japanese -->
     
@@ -309 +309 @@
 
         <h3>Internal Server Errors</h3>
-        <p>Als u een "Internal Server Error" foutboodschap krijgt, kan het zijn dat er instellingen op uw webserver aangepast moeten worden. Gelieve onze <a href="http://www.movabletype.org/documentation/mt5/install/">installatiegids</a> te consulteren om dit probleem op te lossen, of doorzoek onze <a href="http://www.sixapart.com/movabletype/kb/">kennisdatabank</a>.</p>
+        <p>Als u een "Internal Server Error" foutboodschap krijgt, kan het zijn dat er instellingen op uw webserver aangepast moeten worden. Gelieve onze <a href="http://www.movabletype.org/documentation/installation/">installatiegids</a> te consulteren om dit probleem op te lossen, of doorzoek onze <a href="http://www.sixapart.com/movabletype/kb/">kennisdatabank</a>.</p>
 
         <h3>Meer hulp nodig?</h3>
-        <p>Bijkomende antwoorden of ondersteuning nodig? Kijk in de <a href="http://www.movabletype.org/documentation/mt5/install/">gedetailleerde installatiegids</a>.</p>
+        <p>Bijkomende antwoorden of ondersteuning nodig? Kijk in de <a href="http://www.movabletype.org/documentation/installation/">gedetailleerde installatiegids</a>.</p>
     </div><!-- End Dutch -->
   </div>

branches/greyhound/tmpl/cms/include/footer.tmpl

@@ -22 +22 @@
                 <li><a href="<__trans phrase="http://www.movabletype.org">"><__trans phrase="MovableType.org"></a></li>
                 <li><a href="<__trans phrase="http://plugins.movabletype.org/">"><__trans phrase="Plugins"></a></li>
-                <li><a href="<__trans phrase="http://www.movabletype.org/documentation/mt5/">"><__trans phrase="Documentation"></a></li>
+                <li><a href="<__trans phrase="http://www.movabletype.org/documentation/">"><__trans phrase="Documentation"></a></li>
                 <li><a href="<__trans phrase="http://wiki.movabletype.org/">"><__trans phrase="Wiki"></a></li>
                 <li><a href="<__trans phrase="http://www.movabletype.com/support/">"><__trans phrase="Support"></a></li>

branches/greyhound/tmpl/cms/upgrade.tmpl

@@ -47 +47 @@
     <mt:if name="mt_upgrade">
         <p><__trans phrase="A new version of Movable Type has been installed.  We'll need to complete a few tasks to update your database."></p>
-        <p><__trans phrase="The Movable Type Upgrade Guide can be found <a href='[_1]' target='_blank'>here</a>." params="http://www.movabletype.org/documentation/mt5/upgrade/"></p>
+        <p><__trans phrase="The Movable Type Upgrade Guide can be found <a href='[_1]' target='_blank'>here</a>." params="http://www.movabletype.org/documentation/upgrade/"></p>
     </mt:if>
 

branches/greyhound/tmpl/cms/widget/new_install.tmpl

@@ -16 +16 @@
             </li>
             <li>
-                <a href="<__trans phrase="http://www.movabletype.org/documentation/mt5/">"><__Trans phrase="Movable Type Online Manual"></a>
+                <a href="<__trans phrase="http://www.movabletype.org/documentation/">"><__Trans phrase="Movable Type Online Manual"></a>
                 <span class="description"><__trans phrase="Whether you're new to Movable Type or using it for the first time, learn more about what this tool can do for you."></span>
             </li>

branches/greyhound/tmpl/cms/widget/new_user.tmpl

@@ -9 +9 @@
         <ul>
             <li>
-                <a href="<__trans phrase="http://www.movabletype.org/documentation/mt5/">"><__trans phrase="Movable Type Online Manual"></a>
+                <a href="<__trans phrase="http://www.movabletype.org/documentation/">"><__trans phrase="Movable Type Online Manual"></a>
                 <span class="description"><__trans phrase="Whether you're new to Movable Type or using it for the first time, learn more about what this tool can do for you."></span>
             </li>

branches/greyhound/tmpl/wizard/configure.tmpl

@@ -69 +69 @@
 
 <mt:unless name="success">
-<mt:setvarblock name="db_setup_url"><__trans phrase="http://www.movabletype.org/documentation/mt5/[_1]" params="installation/setting-up-your-database.html"></mt:setvarblock>
+<mt:setvarblock name="db_setup_url"><__trans phrase="http://www.movabletype.org/documentation/[_1]" params="installation/setting-up-your-database.html"></mt:setvarblock>
     <div id="db_hint">
         <p class="hint"><__trans phrase="Is your preferred database not listed? View the <a href="[_1]" target="_blank">Movable Type System Check</a> see if additional modules are necessary." params="mt-check.cgi"></p>