X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/fcf4f1238da1b084aafdb88753eed511b948b54b..ba80646e4e31a6c19d4ef8b60ea0e30cf3bd00cc:/res/values-et-rEE/strings.xml

diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 0659c4cb..319cdffb 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -69,6 +69,7 @@
   <string name="uploader_info_uploading">Üleslaadimine</string>
   <string name="file_list_seconds_ago">sekundit tagasi</string>
   <string name="file_list_empty">Siin pole midagi. Lae midagi üles!</string>
+  <string name="file_list_loading">Laadimine...</string>
   <string name="local_file_list_empty">Kaustas pole faile.</string>
   <string name="filedetails_select_file">Lisainfo vaatamiseks vajuta failile.</string>
   <string name="filedetails_size">Suurus:</string>
@@ -257,11 +258,7 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi
   <string name="instant_upload_on_wifi">Lae pilte üles ainult läbi WiFi</string>
   <string name="instant_video_upload_on_wifi">Laadi videod üles ainult WiFi-t kasutades</string>
   <string name="instant_upload_path">/InstantUpload</string>
-  <string name="conflict_title">Uuenduse konflikt</string>
-  <string name="conflict_message">Serveris asuvat faili ei sünkroniseeritud kohaliku failiga. Jätkates kirjutatakse serveris asuva faili sisu üle.</string>
   <string name="conflict_keep_both">Säilita mõlemad</string>
-  <string name="conflict_overwrite">Kirjuta üle</string>
-  <string name="conflict_dont_upload">Ära uuenda</string>
   <string name="preview_image_description">Pildi eelvaade</string>
   <string name="preview_image_error_unknown_format">Seda pilti ei saa näidata</string>
   <string name="error__upload__local_file_not_copied">%1$s ei suudetud kopeerida kohalikku kataloogi %2$s</string>
@@ -320,4 +317,12 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi
   <string name="auth_host_address">Serveri aadress</string>
   <string name="common_error_out_memory">Mälu pole piisavalt</string>
   <string name="username">Kasutajanimi</string>
+  <string name="file_list__footer__folder">1 kaust</string>
+  <string name="file_list__footer__folders">%1$d kaustad</string>
+  <string name="file_list__footer__file">1 fail</string>
+  <string name="file_list__footer__file_and_folder">1 fail, 1 kaust</string>
+  <string name="file_list__footer__file_and_folders">1 fail, %1$d kaustad</string>
+  <string name="file_list__footer__files">%1$d faili</string>
+  <string name="file_list__footer__files_and_folder">%1$d faili, 1 kaust</string>
+  <string name="file_list__footer__files_and_folders">%1$d faili, %2$d kausta</string>
 </resources>