From: David A. Velasco Date: Thu, 6 Feb 2014 14:13:40 +0000 (+0100) Subject: Merge branch 'develop' into share_link__new_share X-Git-Tag: oc-android-1.5.5~58^2~2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/62c382b1dcbac51eee1efa5854f5664ef3313d1b?hp=45b73934faa70408007ca4461d8a514282806c3a Merge branch 'develop' into share_link__new_share --- diff --git a/res/values/strings.xml b/res/values/strings.xml index 1725ae38..b86d6085 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -60,6 +60,7 @@ Refresh file File was renamed to %1$s during upload Share link + Unshare link Yes No OK @@ -249,4 +250,5 @@ Sorry, sharing is not enabled on your server. Please contact your administrator. Unable to share this file or folder. Please, make sure it exists An error occurred while trying to share this file or folder + An error occurred while trying to unshare this file or folder