diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-19 10:47:41 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-07-20 17:06:17 -0500 |
| commit | 242b842db88091ac76f2642c11b6eccab22c6f88 (patch) | |
| tree | b9ad8c9c1e2dc31b2fc69bfabfaa7c10dc37ae5a | |
| parent | 4d65924f5a7fd024d9926185839472a060cdeac6 (diff) | |
| download | gitlab-ce-242b842db88091ac76f2642c11b6eccab22c6f88.tar.gz | |
Merge branch '34789_add_japanese_translations_to_i18n' into 'master'
Add Japanese Translation to i18n
Closes #34789
See merge request !12693
| -rw-r--r-- | changelogs/unreleased/34789-add-japanese-translations-of-commits-page.yml | 4 | ||||
| -rw-r--r-- | lib/gitlab/i18n.rb | 3 | ||||
| -rw-r--r-- | locale/ja/gitlab.po | 1 | ||||
| -rw-r--r-- | locale/ja/gitlab.po.time_stamp | 0 |
4 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/34789-add-japanese-translations-of-commits-page.yml b/changelogs/unreleased/34789-add-japanese-translations-of-commits-page.yml new file mode 100644 index 00000000000..40a24847580 --- /dev/null +++ b/changelogs/unreleased/34789-add-japanese-translations-of-commits-page.yml @@ -0,0 +1,4 @@ +--- +title: Add Japanese translations for Cycle Analytics & Project pages & Repository pages & Commits pages & Pipeline Charts. +merge_request: 12693 +author: Huang Tao diff --git a/lib/gitlab/i18n.rb b/lib/gitlab/i18n.rb index 4f31169610d..7e868190477 100644 --- 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 diff --git a/locale/ja/gitlab.po b/locale/ja/gitlab.po index d783186c9f5..c0aa536e4a4 100644 --- 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" diff --git a/locale/ja/gitlab.po.time_stamp b/locale/ja/gitlab.po.time_stamp new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/locale/ja/gitlab.po.time_stamp |