Merge branch 'develop' for release v2.0v2.0

1 files changed, 18 insertions, 13 deletions

diff --git a/viewer/src/locales/en.json b/viewer/src/locales/en.json
index 9e0fd4b..b21262a 100644
--- a/viewer/src/locales/en.json
+++ b/viewer/src/locales/en.json
@@ -1,19 +1,24 @@
 {
-  "tagInput.placeholder": "Filters",
-  "tagInput.nomatch": "No match",
-  "search.no-results": "No results",
-  "search.no-results.otherfolders": "No results • {0} result{1} in other folders",
-  "panelLeft.propositions": "Related filters",
-  "tag-propositions.substraction": "Exclude items with this tag",
-  "tag-propositions.addition": "Include all items with this tag",
-  "tag-propositions.intersection": "Search for this tag",
-  "tag-propositions.item-count": "Item count",
-  "gallery.unknowntype": "Unknown item type",
+  "command.back": "Go back",
+  "command.parent": "Go to parent directory",
   "command.search": "Open/close search panel",
   "command.search.clear": "Clear",
   "command.search.search": "Search",
-  "command.back": "Go back",
-  "command.parent": "Go to parent directory",
+  "command.sort.byDateAsc": "By date (oldest first)",
+  "command.sort.byDateDesc": "By date (most recent first)",
+  "command.sort.byTitleAsc": "By title (A to Z)",
   "directory.no-results": "Empty directory",
-  "panelLeft.propositions.other": "other filters"
+  "download.download-file-fmt": "Download {0}",
+  "gallery.unknown-resource": "Resource not found",
+  "panelLeft.information.title": "Information",
+  "panelLeft.propositions": "Related filters",
+  "panelLeft.propositions.other": "other filters",
+  "search.no-result-fmt": "No result<br>({0} match in other folders) | No result<br>({0} matches in other folders)",
+  "tag-propositions.addition": "Include all items with this tag",
+  "tag-propositions.intersection": "Search for this tag",
+  "tag-propositions.item-count": "Item count",
+  "tag-propositions.showmore": "show more ({0})",
+  "tag-propositions.substraction": "Exclude items with this tag",
+  "tagInput.nomatch": "No match",
+  "tagInput.placeholder": "Filters"
 }