Merge branch 'master' into routing

Conflicts:
	apps/files/js/fileactions.js
	lib/base.php
	lib/helper.php
	lib/ocs.php

1 files changed, 28 insertions, 0 deletions

diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
new file mode 100644
index 00000000000..10f7276703a
--- /dev/null
+++ b/lib/l10n/ja_JP.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Help" => "ヘルプ",
+"Personal" => "個人設定",
+"Settings" => "設定",
+"Users" => "ユーザ",
+"Apps" => "アプリ",
+"Admin" => "管理者",
+"ZIP download is turned off." => "ZIPダウンロードは無効です。",
+"Files need to be downloaded one by one." => "ファイルは1つずつダウンロードする必要があります。",
+"Back to Files" => "ファイルに戻る",
+"Selected files too large to generate zip file." => "選択したファイルはZIPファイルの生成には大きすぎます。",
+"Application is not enabled" => "アプリケーションは無効です",
+"Authentication error" => "認証エラー",
+"Token expired. Please reload page." => "トークンが無効になりました。ページを再読込してください。",
+"seconds ago" => "秒前",
+"1 minute ago" => "1分前",
+"%d minutes ago" => "%d 分前",
+"today" => "今日",
+"yesterday" => "昨日",
+"%d days ago" => "%d 日前",
+"last month" => "先月",
+"months ago" => "月前",
+"last year" => "昨年",
+"years ago" => "年前",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s が利用可能です。<a href=\"%s\">詳細情報</a> を確認ください",
+"up to date" => "最新です",
+"updates check is disabled" => "更新チェックは無効です"
+);