summaryrefslogtreecommitdiffstats
path: root/settings/l10n/ja.js
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2016-06-26 12:55:05 +0200
committerLukas Reschke <lukas@owncloud.com>2016-06-26 12:55:05 +0200
commit7a9d60d87eb8e4414e5fe05830b088d426ff810d (patch)
tree0fc97a7eacfd071475afd8bc6d4372babacb5740 /settings/l10n/ja.js
parent5387b942c44e05b87ba2a0fd54168f5278a31344 (diff)
parent52eab2a61a5d27b64fcd0440b91f854c052933a9 (diff)
downloadnextcloud-server-7a9d60d87eb8e4414e5fe05830b088d426ff810d.tar.gz
nextcloud-server-7a9d60d87eb8e4414e5fe05830b088d426ff810d.zip
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
Diffstat (limited to 'settings/l10n/ja.js')
-rw-r--r--settings/l10n/ja.js8
1 files changed, 3 insertions, 5 deletions
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index f294ac64f97..a466d7cf225 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -119,7 +119,6 @@ OC.L10N.register(
"Unlimited" : "無制限",
"Personal info" : "個人情報",
"Sessions" : "セッション",
- "Devices" : "デバイス",
"Sync clients" : "同期用クライアント",
"Everything (fatal issues, errors, warnings, info, debug)" : "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
"Info, warnings, errors and fatal issues" : "情報、警告、エラー、致命的な問題",
@@ -267,13 +266,12 @@ OC.L10N.register(
"Current password" : "現在のパスワード",
"New password" : "新しいパスワード",
"Change password" : "パスワードを変更",
+ "Language" : "言語",
+ "Help translate" : "翻訳に協力する",
"Browser" : "ブラウザ",
"Most recent activity" : "最新のアクティビティ",
- "You've linked these devices." : "以下のデバイスをリンクしました。",
"Name" : "名前",
- "A device password is a passcode that gives an app or device permissions to access your ownCloud account." : "デバイスパスワードはownCloudアカウントがアプリにアクセスするためアクセス許可をデバイスに与えるパスコードです。",
- "Language" : "言語",
- "Help translate" : "翻訳に協力する",
+ "Done" : "完了",
"Get the apps to sync your files" : "ファイルを同期するアプリを取得しましょう",
"Desktop client" : "デスクトップクライアント",
"Android app" : "Androidアプリ",