Merge branch 'develop' into send_file_pr311_with_develop

diff --cc res/menu/file_actions_menu.xml
Simple merge

diff --cc res/values-de-rCH/strings.xml
index f09e75c,5693825..db98bf6
--- 1/res/values-de-rCH/strings.xml
--- 2/res/values-de-rCH/strings.xml
+++ b/res/values-de-rCH/strings.xml
@@@ -10,7 -10,7 +10,7 @@@
    <string name="actionbar_mkdir">Ordner anlegen</string>
    <string name="actionbar_settings">Einstellungen</string>
    <string name="actionbar_see_details">Details</string>
-   <string name="actionbar_send_file">Datei Senden</string>
 -  <string name="actionbar_share_file">Freigeben</string>
++  <string name="actionbar_send_file">Freigeben</string>
    <string name="prefs_category_general">Allgemein</string>
    <string name="prefs_category_more">Mehr</string>
    <string name="prefs_accounts">Konten</string>

diff --cc res/values-de-rDE/strings.xml
index 64b43cb,494e22c..7943ca7
--- 1/res/values-de-rDE/strings.xml
--- 2/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@@ -10,7 -10,7 +10,7 @@@
    <string name="actionbar_mkdir">Ordner anlegen</string>
    <string name="actionbar_settings">Einstellungen</string>
    <string name="actionbar_see_details">Details</string>
-   <string name="actionbar_send_file">Datei senden</string>
 -  <string name="actionbar_share_file">Teilen</string>
++  <string name="actionbar_send_file">Teilen</string>
    <string name="prefs_category_general">Allgemein</string>
    <string name="prefs_category_more">Mehr</string>
    <string name="prefs_accounts">Konten</string>

diff --cc res/values-de/strings.xml
index 95d370d,c564a51..7fe82aa
--- 1/res/values-de/strings.xml
--- 2/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@@ -10,7 -10,7 +10,7 @@@
    <string name="actionbar_mkdir">Ordner anlegen</string>
    <string name="actionbar_settings">Einstellungen</string>
    <string name="actionbar_see_details">Details</string>
-   <string name="actionbar_send_file">Datei Senden</string>
 -  <string name="actionbar_share_file">Teilen</string>
++  <string name="actionbar_send_file">Teilen</string>
    <string name="prefs_category_general">Allgemein</string>
    <string name="prefs_category_more">Mehr</string>
    <string name="prefs_accounts">Konten</string>

diff --cc res/values/strings.xml
index 601a703,6c392b2..822cb2a
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -250,7 -250,6 +250,8 @@@
        <string name="share_link_no_support_share_api">Sorry, sharing is not enabled on your server. Please contact your administrator.</string>
        <string name="share_link_file_no_exist">Unable to share this file or folder. Please, make sure it exists</string>
        <string name="share_link_file_error">An error occurred while trying to share this file or folder</string>
+       <string name="unshare_link_file_no_exist">Unable to unshare this file or folder. It does not exist.</string>
        <string name="unshare_link_file_error">An error occurred while trying to unshare this file or folder</string>
 +      
 +      <string name="send_file_title_intent">Send</string>
  </resources>

diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Simple merge

diff --cc src/com/owncloud/android/ui/preview/PreviewImageFragment.java
Simple merge