Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a85beaf..b9aeea4 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,6 +20,14 @@
        <!-- TODO re-enable when server-side folder size calculation is available   
        <item>Biggest - Smallest</item>  -->
     </string-array>
        <!-- TODO re-enable when server-side folder size calculation is available   
        <item>Biggest - Smallest</item>  -->
     </string-array>

+    <string-array name="drawer_items">
+        <item>Accounts</item>
+           <item>All Files</item>
+           <item>On device</item>
+           <item>Settings</item>
+    </string-array>
+    <string name="drawer_open">ownCloud</string>
+       <string name="drawer_close">Close</string>

     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>
     <string name="prefs_accounts">Accounts</string>
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>
     <string name="prefs_accounts">Accounts</string>


@@ -330,9 +338,14 @@
        <string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
     <string name="download_folder_failed_content">Download of %1$s folder could not be completed</string>
 
        <string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
     <string name="download_folder_failed_content">Download of %1$s folder could not be completed</string>
 

-       <string name="subject_token">%1$s shared \"%2$s\" with you</string>
+       <string name="shared_subject_header">shared</string>
+       <string name="with_you_subject_header">with you</string>
+    
+       <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>

 
     <string name="auth_refresh_button">Refresh connection</string>
     <string name="auth_host_address">Server address</string>
 
     <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>

 
 

+    <string name="username">Username</string>

 </resources>
 </resources>