Merge master into ocs_api

1 files changed, 25 insertions, 10 deletions

diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 88e91719282..9b9679068c6 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -9,28 +9,44 @@
 "Files" => "Failid",
 "Unshare" => "Lõpeta jagamine",
 "Delete" => "Kustuta",
-"already exists" => "on juba olemas",
+"Rename" => "ümber",
+"{new_name} already exists" => "{new_name} on juba olemas",
 "replace" => "asenda",
 "suggest name" => "soovita nime",
 "cancel" => "loobu",
-"replaced" => "asendatud",
+"replaced {new_name}" => "asendatud nimega {new_name}",
 "undo" => "tagasi",
-"with" => "millega",
-"unshared" => "jagamata",
-"deleted" => "kustutatud",
+"replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}",
+"unshared {files}" => "jagamata {files}",
+"deleted {files}" => "kustutatud {files}",
 "generating ZIP-file, it may take some time." => "ZIP-faili loomine, see võib veidi aega võtta.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti",
 "Upload Error" => "Üleslaadimise viga",
 "Pending" => "Ootel",
+"1 file uploading" => "1 faili üleslaadimisel",
+"{count} files uploading" => "{count} faili üleslaadimist",
 "Upload cancelled." => "Üleslaadimine tühistati.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös.  Lehelt lahkumine katkestab selle üleslaadimise.",
 "Invalid name, '/' is not allowed." => "Vigane nimi, '/' pole lubatud.",
+"{count} files scanned" => "{count} faili skännitud",
+"error while scanning" => "viga skännimisel",
+"Name" => "Nimi",
 "Size" => "Suurus",
 "Modified" => "Muudetud",
-"folder" => "kaust",
-"folders" => "kausta",
-"file" => "fail",
-"files" => "faili",
+"1 folder" => "1 kaust",
+"{count} folders" => "{count} kausta",
+"1 file" => "1 fail",
+"{count} files" => "{count} faili",
+"seconds ago" => "sekundit tagasi",
+"1 minute ago" => "1 minut tagasi",
+"{minutes} minutes ago" => "{minutes} minutit tagasi",
+"today" => "täna",
+"yesterday" => "eile",
+"{days} days ago" => "{days} päeva tagasi",
+"last month" => "viimasel kuul",
+"months ago" => "kuu tagasi",
+"last year" => "viimasel aastal",
+"years ago" => "aastat tagasi",
 "File handling" => "Failide käsitlemine",
 "Maximum upload size" => "Maksimaalne üleslaadimise suurus",
 "max. possible: " => "maks. võimalik: ",
@@ -46,7 +62,6 @@
 "Upload" => "Lae üles",
 "Cancel upload" => "Tühista üleslaadimine",
 "Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",
-"Name" => "Nimi",
 "Share" => "Jaga",
 "Download" => "Lae alla",
 "Upload too large" => "Üleslaadimine on liiga suur",