merge master with resolved conflicts

1 files changed, 7 insertions, 9 deletions

diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index ca407a730bb..25597cafeff 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -26,8 +26,8 @@ $TRANSLATIONS = array(
 "Disable" => "Lülita välja",
 "Enable" => "Lülita sisse",
 "Please wait...." => "Palun oota...",
-"Error while disabling app" => "Viga rakendi keelamisel",
-"Error while enabling app" => "Viga rakendi lubamisel",
+"Error while disabling app" => "Viga rakenduse keelamisel",
+"Error while enabling app" => "Viga rakenduse lubamisel",
 "Updating...." => "Uuendamine...",
 "Error while updating app" => "Viga rakenduse uuendamisel",
 "Error" => "Viga",
@@ -59,9 +59,7 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Internetiühendus ei toimi",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.",
 "Cron" => "Cron",
-"Execute one task with each page loaded" => "Käivita toiming lehe laadimisel",
-"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php on registreeritud webcron teenusena laadimaks cron.php iga minut üle http.",
-"Use systems cron service to call the cron.php file once a minute." => "Kasuta süsteemi cron teenust käivitamaks faili cron.php kord minutis.",
+"Execute one task with each page loaded" => "Käivita toiming igal lehe laadimisel",
 "Sharing" => "Jagamine",
 "Enable Share API" => "Luba Share API",
 "Allow apps to use the Share API" => "Luba rakendustel kasutada Share API-t",
@@ -110,12 +108,12 @@ $TRANSLATIONS = array(
 "Your email address" => "Sinu e-posti aadress",
 "Fill in an email address to enable password recovery" => "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress",
 "Profile picture" => "Profiili pilt",
-"Upload new" => "Laadi uus",
+"Upload new" => "Laadi uus üles",
 "Select new from Files" => "Vali failidest uus",
 "Remove image" => "Eemalda pilt",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Kas png või jpg. Võimalikult ruudukujuline, kuid Sul on võimalus veel lõigata.",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Kas png või jpg. Võimalikult ruudukujuline, kuid sul on võimalus seda veel lõigata.",
 "Abort" => "Katkesta",
-"Choose as profile image" => "Vali kui profiili pilt",
+"Choose as profile image" => "Vali profiilipildiks",
 "Language" => "Keel",
 "Help translate" => "Aita tõlkida",
 "WebDAV" => "WebDAV",
@@ -126,7 +124,7 @@ $TRANSLATIONS = array(
 "Decrypt all Files" => "Dekrüpteeri kõik failid",
 "Login Name" => "Kasutajanimi",
 "Create" => "Lisa",
-"Admin Recovery Password" => "Admin taasteparool",
+"Admin Recovery Password" => "Admini parooli taastamine",
 "Enter the recovery password in order to recover the users files during password change" => "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
 "Default Storage" => "Vaikimisi maht",
 "Unlimited" => "Piiramatult",