Always show credits_en.html

Considering the contents and readers, the translation of header lines in credits_ja.html is not helpful so much. Hence this CL removes credits_ja.html. BUG= TEST= REF_BUG= REF_CL=137624693 REF_TIME=2016-10-30T15:00:06+09:00 REF_TIME_RAW=1477807206 +0900
google · Oct 30, 2016 · 2ec6c8f · 2ec6c8f
1 parent e253375
commit 2ec6c8f
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 2,037 deletions.
diff --git a/src/chrome/nacl/_locales/ja/messages_template.json b/src/chrome/nacl/_locales/ja/messages_template.json
@@ -181,7 +181,7 @@
     "message": "Copyright © 2013 Google Inc. All Rights Reserved."
   },
   "configOssCreditsDescription": {
-    "message": "本ソフトウェアは<a href=\"./credits_ja.html\">オープンソースソフトウェア</a>を利用しています。"
+    "message": "本ソフトウェアは<a href=\"./credits_en.html\">オープンソースソフトウェア</a>を利用しています。"
   },
   "configDialogCancel": {
     "message": "キャンセル"

diff --git a/src/chrome/nacl/nacl_extension.gyp b/src/chrome/nacl/nacl_extension.gyp
@@ -40,7 +40,6 @@
       '<(gen_out_dir)/nacl_mozc/_locales/en/messages.json',
       '<(gen_out_dir)/nacl_mozc/_locales/ja/messages.json',
       '<(gen_out_dir)/nacl_mozc/credits_en.html',
-      '<(gen_out_dir)/nacl_mozc/credits_ja.html',
       '<(gen_out_dir)/nacl_mozc/dictionary_tool.js',
       '<(gen_out_dir)/nacl_mozc/key_translator.js',
       '<(gen_out_dir)/nacl_mozc/manifest.json',
@@ -392,7 +391,6 @@
           'files': [
             '../../data/images/product_icon_32bpp-128.png',
             '../../data/installer/credits_en.html',
-            '../../data/installer/credits_ja.html',
             '<(gen_out_dir)/manifest.json',
             '<(gen_out_dir)/nacl_mozc_version.js',
             '<(PRODUCT_DIR)/nacl_session_handler_x86_32.nexe',

diff --git a/src/data/installer/credits_ja.html b/src/data/installer/credits_ja.html
diff --git a/src/data/version/mozc_version_template.bzl b/src/data/version/mozc_version_template.bzl
@@ -30,7 +30,7 @@
 
 MAJOR=2
 MINOR=19
-BUILD=2656
+BUILD=2657
 REVISION=102
 # This version represents the version of Mozc IME engine (converter, predictor,
 # etc.).  This version info is included both in the Mozc server and in the Mozc

diff --git a/src/gui/about_dialog/about_dialog.cc b/src/gui/about_dialog/about_dialog.cc
@@ -52,7 +52,7 @@ void defaultLinkActivated(const QString &str) {
 
 // set document file paths by adding <server_path>/documents/ to file name.
 bool AddLocalPath(string *str) {
-  const char *filenames[] = { "credits_en.html", "credits_ja.html" };
+  const char *filenames[] = { "credits_en.html" };
   for (size_t i = 0; i < arraysize(filenames); ++i) {
     if (str->find(filenames[i]) != string::npos) {
       string tmp;

diff --git a/src/gui/about_dialog/about_dialog_ja.qm b/src/gui/about_dialog/about_dialog_ja.qm
diff --git a/src/gui/about_dialog/about_dialog_ja.ts b/src/gui/about_dialog/about_dialog_ja.ts
@@ -21,7 +21,7 @@
     <message>
         <location filename="about_dialog.ui" line="95"/>
         <source>&lt;html&gt;&lt;body&gt;Mozc is made possible by &lt;a href=&quot;file://credits_en.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;open source software&lt;/span&gt;&lt;/a&gt;.&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;body&gt;Mozcは&lt;a href=&quot;file://credits_ja.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;オープンソースソフトウェア&lt;/span&gt;&lt;/a&gt;を利用しています。&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;body&gt;Mozcは&lt;a href=&quot;file://credits_en.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;オープンソースソフトウェア&lt;/span&gt;&lt;/a&gt;を利用しています。&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="about_dialog.ui" line="133"/>

diff --git a/src/mac/mac.gyp b/src/mac/mac.gyp
@@ -295,7 +295,6 @@
             '../data/images/mac/hiragana.tiff',
             '../data/images/mac/product_icon.icns',
             '../data/installer/credits_en.html',
-            '../data/installer/credits_ja.html',
             'English.lproj/Config.xib',
             '<(gen_out_dir)/English.lproj/InfoPlist.strings',
             'Japanese.lproj/Config.xib',

diff --git a/src/win32/installer/installer_32bit.wxs b/src/win32/installer/installer_32bit.wxs
@@ -480,11 +480,6 @@
               <?endif?>
             <?endif?>
             <Directory Id='DocumentsDir' Name='documents'>
-              <Component Id='CreditsJa' Guid='*'>
-                <File Id='credits_ja.html' Name='credits_ja.html' DiskId='1'
-                      Checksum='yes' Vital='yes'
-                      Source='$(var.DocumentsDir)/credits_ja.html' />
-              </Component>
               <Component Id='CreditsEn' Guid='*'>
                 <File Id='credits_en.html' Name='credits_en.html' DiskId='1'
                       Checksum='yes' Vital='yes'
@@ -743,7 +738,6 @@
       <ComponentRef Id='SysProcs' />
       <ComponentRef Id='PrelaunchProcesses' />
       <ComponentRef Id='GIMEJaElevationPolicy32' />
-      <ComponentRef Id='CreditsJa' />
       <ComponentRef Id='CreditsEn' />
     </Feature>
 

diff --git a/src/win32/installer/installer_64bit.wxs b/src/win32/installer/installer_64bit.wxs
@@ -497,11 +497,6 @@
               <?endif?>
             <?endif?>
             <Directory Id='DocumentsDir' Name='documents'>
-              <Component Id='CreditsJa' Guid='*'>
-                <File Id='credits_ja.html' Name='credits_ja.html' DiskId='1'
-                      Checksum='yes' Vital='yes'
-                      Source='$(var.DocumentsDir)/credits_ja.html' />
-              </Component>
               <Component Id='CreditsEn' Guid='*'>
                 <File Id='credits_en.html' Name='credits_en.html' DiskId='1'
                       Checksum='yes' Vital='yes'
@@ -816,7 +811,6 @@
       <ComponentRef Id='PrelaunchProcesses' />
       <ComponentRef Id='GIMEJaElevationPolicy32' />
       <ComponentRef Id='GIMEJaElevationPolicy64' />
-      <ComponentRef Id='CreditsJa' />
       <ComponentRef Id='CreditsEn' />
     </Feature>