From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 29 Nov 2015 19:21:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into beta
X-Git-Tag: beta-20151129~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4b9a2fa00f866b49c880d3eeb94c580ecad2f81c?hp=26b1864940df7c02b1941355034fe83edd1d6bd2

Merge remote-tracking branch 'remotes/upstream/master' into beta
---

diff --git a/res/values-ja-rJP/strings.xml b/res/values-ja-rJP/strings.xml
index eb66912f..f6461285 100644
--- a/res/values-ja-rJP/strings.xml
+++ b/res/values-ja-rJP/strings.xml
@@ -291,6 +291,7 @@
   <string name="forbidden_permissions_delete">ファイルを削除</string>
   <string name="share_link_forbidden_permissions">ファイルを共有</string>
   <string name="unshare_link_forbidden_permissions">ファイルの共有を解除</string>
+  <string name="update_link_forbidden_permissions">この共有リンクを更新</string>
   <string name="forbidden_permissions_create">ファイルを作成</string>
   <string name="uploader_upload_forbidden_permissions">フォルダーをアップロード</string>
   <string name="downloader_download_file_not_found">ファイルはサーバー上で利用できません</string>