From: masensio <masensio@solidgear.es>
Date: Mon, 17 Feb 2014 07:45:52 +0000 (+0100)
Subject: Merge branch 'develop' into send_file_pr311_with_develop
X-Git-Tag: oc-android-1.5.5~22^2~27
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/99686805e16c9891bb68c0ae4e7478913e16270e?ds=inline

Merge branch 'develop' into send_file_pr311_with_develop
---

99686805e16c9891bb68c0ae4e7478913e16270e
diff --cc res/values-de-rCH/strings.xml
index f09e75c8,5693825a..db98bf62
--- a/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 64b43cbe,494e22cc..7943ca7e
--- a/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 95d370d7,c564a519..7fe82aa7
--- a/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 601a703d,6c392b24..822cb2a8
--- a/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>