From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 10 12:15:33 2014
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B3E82D2B;
 Mon, 10 Nov 2014 12:15:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 85EC7B1E;
 Mon, 10 Nov 2014 12:15:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAACFXRl032222;
 Mon, 10 Nov 2014 12:15:33 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAACFXR6032220;
 Mon, 10 Nov 2014 12:15:33 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201411101215.sAACFXR6032220@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ryusuke set sender to
 ryusuke@FreeBSD.org using -f
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Mon, 10 Nov 2014 12:15:33 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r45964 - head/ja_JP.eucJP/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Nov 2014 12:15:33 -0000

Author: ryusuke
Date: Mon Nov 10 12:15:32 2014
New Revision: 45964
URL: https://svnweb.freebsd.org/changeset/doc/45964

Log:
  - Merge the following from the English version:
  
  	r45720 -> r45920	head/ja_JP.eucJP/share/xml/header.l10n.ent
  	r34121 -> r45681	head/ja_JP.eucJP/share/xml/templates.events.xsl

Modified:
  head/ja_JP.eucJP/share/xml/header.l10n.ent
  head/ja_JP.eucJP/share/xml/templates.events.xsl

Modified: head/ja_JP.eucJP/share/xml/header.l10n.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/header.l10n.ent	Mon Nov 10 06:32:07 2014	(r45963)
+++ head/ja_JP.eucJP/share/xml/header.l10n.ent	Mon Nov 10 12:15:32 2014	(r45964)
@@ -5,7 +5,7 @@
 <!-- PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN" -->
 
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r45720 -->
+<!-- Original revision: r45920 -->
 
 <!ENTITY copyright '<span xmlns="http://www.w3.org/1999/xhtml"><a href="&base;/search/index-site.html">サイトマップ</a> |
   <a href="&base;/copyright/">知的財産権について</a> | <!-- &copy; -->(C) 1995&ndash;2014 The FreeBSD Project.

Modified: head/ja_JP.eucJP/share/xml/templates.events.xsl
==============================================================================
--- head/ja_JP.eucJP/share/xml/templates.events.xsl	Mon Nov 10 06:32:07 2014	(r45963)
+++ head/ja_JP.eucJP/share/xml/templates.events.xsl	Mon Nov 10 12:15:32 2014	(r45964)
@@ -8,7 +8,7 @@
 
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.13 -->
+<!-- Original revision: r45681 -->
 
 <!-- Copyright (c) 2003 Simon L. Nielsen <simon@FreeBSD.org>
      Copyright (c) 2008 Murray M Stokely <murray@FreeBSD.org>
@@ -61,7 +61,7 @@
 	     enddate/day &gt;= date:day-in-month()))]"
     use="location/country" />
 
-  <xsl:variable name="charturl" select="'http://chart.apis.google.com/chart?cht=t&amp;chs=400x200&amp;chtm=world&amp;chco=ffffff,ffbe38,600000&amp;chf=bg,s,4D89F9'" />
+  <xsl:variable name="charturl" select="'https://chart.googleapis.com/chart?cht=t&amp;chs=400x200&amp;chtm=world&amp;chco=ffffff,ffbe38,600000&amp;chf=bg,s,4D89F9'" />
 
   <xsl:variable name="title">&title;</xsl:variable>
 
@@ -266,14 +266,6 @@
   <xsl:template match="event" mode="upcoming">
     <li>
       <xsl:call-template name="eventbody"/>
-      <p>ソーシャルリンク : <a rel="nofollow">
-      <xsl:if test="upcomingurl">
-        <xsl:attribute name="href"><xsl:value-of select="upcomingurl" /></xsl:attribute>
-      </xsl:if>
-      <xsl:if test="not(upcomingurl)">
-        <xsl:attribute name="href">http://upcoming.yahoo.com/search?type=Events&amp;q=<xsl:value-of select="name" />&amp;Search=GO</xsl:attribute>
-      </xsl:if>
-      upcoming</a></p>
     </li>
   </xsl:template>