From: purigarcia <pgarcia@solidgear.es>
Date: Fri, 29 May 2015 12:17:52 +0000 (+0200)
Subject: Merge branch 'develop' into automationTest
X-Git-Tag: oc-android-1.7.2~1^2~32^2~12
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/916bd5c6ca02dde2916732a826814377e495dcfe?hp=-c

Merge branch 'develop' into automationTest
---

916bd5c6ca02dde2916732a826814377e495dcfe
diff --combined res/values/strings.xml
index c8c1ad71,0e2e9458..5b19c75c
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -78,7 -78,6 +78,7 @@@
      <string name="filedetails_download">Download</string>
      <string name="filedetails_sync_file">Refresh file</string>
      <string name="filedetails_renamed_in_upload_msg">File was renamed to %1$s during upload</string>
 +    <string name="list_layout">List Layout</string>
      <string name="action_share_file">Share link</string>
      <string name="action_unshare_file">Unshare link</string>
      <string name="common_yes">Yes</string>
@@@ -335,5 -334,6 +335,6 @@@
  
      <string name="auth_refresh_button">Refresh connection</string>
      <string name="auth_host_address">Server address</string>
+     <string name="common_error_out_memory">Not enough memory</string>
  
  </resources>