Merge branch '34789_add_japanese_translations_to_i18n' into 'master'

Add Japanese Translation to i18n Closes #34789 See merge request !12693

Merge branch '34789_add_japanese_translations_to_i18n' into 'master'
242b842d · Rémy Coutable · Mike Greiling · 4d65924f · 242b842d · 242b842d
Commit 242b842d authored Jul 19, 2017 by Rémy Coutable Committed by Mike Greiling Jul 20, 2017
4 changed files
--- a/changelogs/unreleased/34789-add-japanese-translations-of-commits-page.yml
+++ b/changelogs/unreleased/34789-add-japanese-translations-of-commits-page.yml
+---
+title: Add Japanese translations for Cycle Analytics & Project pages & Repository pages & Commits pages & Pipeline Charts.
+merge_request: 12693
+author: Huang Tao
--- a/lib/gitlab/i18n.rb
+++ b/lib/gitlab/i18n.rb
@@ -14,7 +14,8 @@ module Gitlab
      'bg' => 'български',
      'ru' => 'Русский',
      'eo' => 'Esperanto',
-      'it' => 'Italiano'
+      'it' => 'Italiano',
+      'ja' => '日本語'
    }.freeze

    def available_locales

--- a/locale/ja/gitlab.po
+++ b/locale/ja/gitlab.po
@@ -12,6 +12,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< HEAD
 "Last-Translator: YANO  TETTER <tetuyano+zana@gmail.com>\n"
 "PO-Revision-Date: 2017-07-19 09:45-0400\n"
 "Last-Translator: YANO  Tethurou <tetuyano+zana@gmail.com>\n"

--- a/locale/ja/gitlab.po.time_stamp
+++ b/locale/ja/gitlab.po.time_stamp