From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 14 Nov 2015 15:33:22 +0000 (+0100)
Subject: Merge branch 'master' of github.com:owncloud/android into resizeCache
X-Git-Tag: beta-20151129~5^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0302a62af58cd305abd35ae5a6aab8a5e68329bf?ds=inline;hp=--cc

Merge branch 'master' of github.com:owncloud/android into resizeCache
---

0302a62af58cd305abd35ae5a6aab8a5e68329bf
diff --cc res/values/strings.xml
index a8bb60a4,320eea1a..4ca286ce
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -365,7 -368,17 +368,19 @@@
      <string name="file_list__footer__files">%1$d files</string>
      <string name="file_list__footer__files_and_folder">%1$d files, 1 folder</string>
      <string name="file_list__footer__files_and_folders">%1$d files, %2$d folders</string>
 +    <string name="common_category">Common</string>
 +    <string name="pref_cache_size">Cache size</string>
  
+     <string name="share_dialog_title">Sharing</string>
+     <string name="share_with_user_section_title">Share with Users and Groups</string>
+     <string name="share_no_users">No data shared with users yet</string>
+     <string name="share_add_user_or_group">Add User or Group</string>
+     <string name="share_search">Search</string>
+ 
+     <string name="search_users_and_groups_hint">Search users and groups</string>
+     <string name="share_group_clarification">%1$s (group)</string>
+ 
+     <string name="share_sharee_unavailable">Sorry, your server version does not allow share with users within clients.
+         \nPlease contact your administrator</string>
+ 
  </resources>