Fixed merge

[pub/Android/ownCloud.git] / res / values / strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c1a1e2c..cf4dffb 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -31,8 +31,11 @@
     <string name="prefs_recommend">Recommend to a friend</string>
     <string name="prefs_feedback">Feedback</string>
     <string name="prefs_imprint">Imprint</string>
     <string name="prefs_recommend">Recommend to a friend</string>
     <string name="prefs_feedback">Feedback</string>
     <string name="prefs_imprint">Imprint</string>

-    
-       <string name="recommend_subject">"Try %1$s on your smartphone!"</string>
+    <string name="prefs_remember_last_share_location">Remember share location</string>
+    <string name="prefs_remember_last_upload_location_summary">Remember last share upload location</string>
+
+
+    <string name="recommend_subject">"Try %1$s on your smartphone!"</string>

        <string name="recommend_text">"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s"
        </string>
 
        <string name="recommend_text">"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s"
        </string>
 


@@ -269,5 +272,4 @@
        <string name="network_error_socket_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
        <string name="network_error_connect_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
        <string name="network_host_not_available">The operation couldn\'t be completed, server is unavailable</string>
        <string name="network_error_socket_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
        <string name="network_error_connect_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
        <string name="network_host_not_available">The operation couldn\'t be completed, server is unavailable</string>

-       

 </resources>
 </resources>