X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/101989b70c302517d1e0dc6eb6c164d97d97fd0a..ddb1e417536a3d8208139c8a9694a70450dfc3af:/res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 84ede4fa..af79535a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,14 +20,13 @@
     	<!-- 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>
-        <item>Logs</item>
-    </string-array>
-    <string name="drawer_open">ownCloud</string>
+    <!-- TODO re-enable when "Accounts" is available in Navigation Drawer -->
+    <!--<string name="drawer_item_accounts">Accounts</string>-->
+    <string name="drawer_item_all_files">All files</string>
+    <!-- TODO re-enable when "On Device" is available
+    <string name="drawer_item_on_device">On device</string>-->
+    <string name="drawer_item_settings">Settings</string>
+    <string name="drawer_item_logs">Logs</string>
 	<string name="drawer_close">Close</string>
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>
@@ -87,6 +86,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>
@@ -222,6 +222,7 @@
     <string name="sync_file_nothing_to_do_msg">File contents already synchronized</string>
     <string name="create_dir_fail_msg">Folder could not be created</string>
     <string name="filename_forbidden_characters">Forbidden characters: / \\ &lt; &gt; : " | ? *</string>
+    <string name="filename_forbidden_charaters_from_server">File name contains at least one invalid character</string>
     <string name="filename_empty">File name cannot be empty</string>
     <string name="wait_a_moment">Wait a moment</string>
     <string name="filedisplay_unexpected_bad_get_content">"Unexpected problem ; please select the file from a different app"</string>
@@ -342,7 +343,7 @@
 	<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="subject_token">%1$s shared \"%2$s\" with you</string>
 
     <string name="auth_refresh_button">Refresh connection</string>
     <string name="auth_host_address">Server address</string>