Merge branch 'feature/new-search' into milestone/12.0

.swiftlint.yml

@@ -36,7 +36,7 @@ disabled_rules:
     - function_parameter_count
     - comment_spacing
     - unused_closure_parameter
-#   - unneeded_notification_center_removal
+    - nesting
 custom_rules:
   empty_line_after_guard_statement:
     included: ".*\\.swift"

ownCloud.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,14 @@
 {
   "pins" : [
+    {
+      "identity" : "down",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/johnxnguyen/Down",
+      "state" : {
+        "branch" : "master",
+        "revision" : "e754ab1c80920dd51a8e08290c912ac1c2ac8b58"
+      }
+    },
     {
       "identity" : "openssl",
       "kind" : "remoteSourceControl",
@@ -14,8 +23,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/microsoft/plcrashreporter.git",
       "state" : {
-        "revision" : "4637a7854de2cc5c354d46fb931d74bdbc2c043e",
-        "version" : "1.7.0"
+        "revision" : "81cdec2b3827feb03286cb297f4c501a8eb98df1",
+        "version" : "1.10.2"
       }
     },
     {

ownCloud/Resources/en.lproj/Localizable.strings

@@ -105,7 +105,13 @@
 "size" = "size";
 "date" = "date";
 "Search folder" = "Search folder";
+"Search tree" = "Search tree";
+"Search from {{folder.name}}" = "Search from {{folder.name}}";
+"Search space" = "Search space";
+"Search {{space.name}}" = "Search {{space.name}}";
 "Search account" = "Search account";
+"Save search" = "Save search";
+
 "Pending" = "Pending";
 "Show parent paths" = "Show parent paths";
 "Reveal in folder" = "Reveal in folder";
@@ -142,6 +148,7 @@
 
 /* Client Messages */
 "Empty folder" = "Empty folder";
+"No contents" = "No contents";
 "This folder contains no files or folders." = "This folder contains no files or folders.";
 "This folder is empty. Fill it with content:" = "This folder is empty. Fill it with content:";
 
@@ -160,6 +167,7 @@
 "Upload files" = "Upload files";
 
 "No matches" = "No matches";
+"The search term you entered did not match any item in the selected scope." = "The search term you entered did not match any item in the selected scope.";
 "There are no results for this search term" = "There are no results for this search term";
 "Status" = "Status";
 

ownCloudAppFramework/Resources/en.lproj/Localizable.strings

@@ -56,6 +56,11 @@
 "keyword_folder" = "folder";
 "keyword_image" = "image";
 "keyword_video" = "video";
+"keyword_audio" = "audio";
+"keyword_document" = "document";
+"keyword_spreadsheet" = "spreadsheet";
+"keyword_presentation" = "presentation";
+"keyword_pdf" = "pdf";
 "keyword_today" = "today";
 "keyword_week" = "week";
 "keyword_month" = "month";
@@ -64,3 +69,66 @@
 "keyword_w" = "w"; /* short-form for "week" */
 "keyword_m" = "m"; /* short-form for "month" */
 "keyword_y" = "y"; /* short-form for "year" */
+
+/* Search token labels */
+"No folder" = "No folder";
+"Folder" = "Folder";
+
+"No file" = "No file";
+"File" = "File";
+
+"No image" = "No image";
+"Image" = "Image";
+
+"No video" = "No video";
+"Video" = "Video";
+
+"No audio" = "No audio";
+"Audio" = "Audio";
+
+"Document" = "Document";
+"No Document" = "No Document";
+
+"Spreadsheet" = "Spreadsheet";
+"No spreadsheet" = "No spreadsheet";
+
+"Presentation" = "Presentation";
+"No presentation" = "No presentation";
+
+"PDF" = "PDF";
+"No PDF" = "No PDF";
+
+"Before" = "Before";
+"After" = "After";
+
+"Not on" = "Not on";
+"On" = "On";
+"Not" = "Not";
+
+"Before today" = "Before today";
+"Before yesterday" = "Before yesterday";
+">%d days ago" = ">%d days ago";
+"Today" = "Today";
+"Since yesterday" = "Since yesterday";
+"Last %d days" = "Last %d days";
+
+"Before this week" = "Before this week";
+"Before last week" = "Before last week";
+">%d weeks ago" = ">%d weeks ago";
+"This week" = "This week";
+"Since last week" = "Since last week";
+"Last %d weeks" = "Last %d weeks";
+
+"Before this month" = "Before this month";
+"Before last month" = "Before last month";
+"> %d months ago" = "> %d months ago";
+"This month" = "This month";
+"Since last month" = "Since last month";
+"Last %d months" = "Last %d months";
+
+"Before this year" = "Before this year";
+"Before last year" = "Before last year";
+"> %d years ago" = "> %d years ago";
+"This year" = "This year";
+"Since last year" = "Since last year";
+"Last %d years" = "Last %d years";