Merge branch 'develop' into shareWithYou_icon_in_fileList

res/values-da/strings.xml

@@ -69,6 +69,7 @@
   <string name="uploader_info_uploading">Uploader</string>
   <string name="file_list_seconds_ago">sekunder siden</string>
   <string name="file_list_empty">Her er tomt. Upload noget!</string>
+  <string name="file_list_loading">Indlæser...</string>
   <string name="local_file_list_empty">Der er ingen filer i denne mappe.</string>
   <string name="filedetails_select_file">Tryk på en fil for at vise yderligere information.</string>
   <string name="filedetails_size">Størelse:</string>
@@ -314,4 +315,12 @@
   <string name="auth_host_address">Serveradresse</string>
   <string name="common_error_out_memory">Ikke tilstrækkelig hukommelse</string>
   <string name="username">Brugernavn</string>
+  <string name="file_list__footer__folder">1 mappe</string>
+  <string name="file_list__footer__folders">%1$d mapper</string>
+  <string name="file_list__footer__file">1 fil</string>
+  <string name="file_list__footer__file_and_folder">1 fil, 1 mappe</string>
+  <string name="file_list__footer__file_and_folders">1 fil, %1$d mapper</string>
+  <string name="file_list__footer__files">%1$d filer</string>
+  <string name="file_list__footer__files_and_folder">%1$d filer, 1 mape</string>
+  <string name="file_list__footer__files_and_folders">%1$d filer, %2$d mapper</string>
 </resources>

res/values-es/strings.xml

@@ -69,6 +69,7 @@
   <string name="uploader_info_uploading">Subiendo...</string>
   <string name="file_list_seconds_ago">hace segundos</string>
   <string name="file_list_empty">No hay nada aquí. ¡Suba algo!</string>
+  <string name="file_list_loading">Cargando...</string>
   <string name="local_file_list_empty">No hay archivos en esta carpeta.</string>
   <string name="filedetails_select_file">Pulsa sobre un archivo para mostrar información adicional.</string>
   <string name="filedetails_size">Tamaño:</string>
@@ -315,4 +316,12 @@
   <string name="auth_host_address">Dirección del servidor</string>
   <string name="common_error_out_memory">No hay suficiente memoria</string>
   <string name="username">Nombre de usuario</string>
+  <string name="file_list__footer__folder">1 carpeta</string>
+  <string name="file_list__footer__folders">%1$d carpetas</string>
+  <string name="file_list__footer__file">1 archivo</string>
+  <string name="file_list__footer__file_and_folder">1 archivo, 1 carpeta</string>
+  <string name="file_list__footer__file_and_folders">1 archivo %1$d carpetas</string>
+  <string name="file_list__footer__files">%1$d archivos</string>
+  <string name="file_list__footer__files_and_folder">%1$d archivos, 1 carpeta</string>
+  <string name="file_list__footer__files_and_folders">%1$d archivos, %2$d carpetas</string>
 </resources>

res/values-fr/strings.xml

@@ -70,6 +70,7 @@ Téléchargez-le ici : %2$s</string>
   <string name="uploader_info_uploading">Téléversement...</string>
   <string name="file_list_seconds_ago">il y a quelques secondes</string>
   <string name="file_list_empty">Il n\'y a rien ici ! Envoyez donc quelque chose :)</string>
+  <string name="file_list_loading">Chargement...</string>
   <string name="local_file_list_empty">Aucun fichier n\'est présent dans ce dossier.</string>
   <string name="filedetails_select_file">Effleurez un fichier pour afficher les informations complémentaires.</string>
   <string name="filedetails_size">Taille :</string>
@@ -311,7 +312,7 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <string name="prefs_category_instant_uploading">Téléversement immédiat</string>
   <string name="prefs_category_security">Sécurité</string>
   <string name="prefs_instant_video_upload_path_title">Répertoire de téléversement des vidéos</string>
-  <string name="download_folder_failed_content">Le téléchargement de %1$s dossier(s) n\'a pas pu être achevé</string>
+  <string name="download_folder_failed_content">Le téléchargement du dossier %1$s n\'a pas pu être achevé</string>
   <string name="shared_subject_header">a partagé</string>
   <string name="with_you_subject_header">avec vous</string>
   <string name="subject_token">%1$s a partagé \"%2$s\" avec vous</string>
@@ -319,4 +320,12 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq
   <string name="auth_host_address">Adresse du serveur</string>
   <string name="common_error_out_memory">Mémoire insuffisante</string>
   <string name="username">Nom d\'utilisateur</string>
+  <string name="file_list__footer__folder">1 dossier</string>
+  <string name="file_list__footer__folders">%1$d dossiers</string>
+  <string name="file_list__footer__file">1 fichier</string>
+  <string name="file_list__footer__file_and_folder">1 fichier, 1 dossier</string>
+  <string name="file_list__footer__file_and_folders">1 fichier, %1$d dossiers</string>
+  <string name="file_list__footer__files">%1$d fichiers</string>
+  <string name="file_list__footer__files_and_folder">%1$d fichiers, 1 dossier</string>
+  <string name="file_list__footer__files_and_folders">%1$d fichiers, %2$d dossiers</string>
 </resources>

res/values-gl/strings.xml

@@ -70,6 +70,7 @@ Descárgueo de aquí: %2$s</string>
   <string name="uploader_info_uploading">Enviando</string>
   <string name="file_list_seconds_ago">segundos atrás</string>
   <string name="file_list_empty">Aquí non hai nada. Envíe algo!</string>
+  <string name="file_list_loading">Cargando...</string>
   <string name="local_file_list_empty">Non hai ficheiros neste cartafol.</string>
   <string name="filedetails_select_file">Prema nun ficheiro para que amose a información adicional.</string>
   <string name="filedetails_size">Tamaño:</string>
@@ -316,4 +317,12 @@ Descárgueo de aquí: %2$s</string>
   <string name="auth_host_address">Enderezo do servidor</string>
   <string name="common_error_out_memory">Non hai memoria abondo</string>
   <string name="username">Nome de usuario</string>
+  <string name="file_list__footer__folder">1 cartafol</string>
+  <string name="file_list__footer__folders">%1$d cartafoles</string>
+  <string name="file_list__footer__file">1 ficheiro</string>
+  <string name="file_list__footer__file_and_folder">1 ficheiro, 1 cartafol</string>
+  <string name="file_list__footer__file_and_folders">1 ficheiro, %1$d cartafoles</string>
+  <string name="file_list__footer__files">%1$d ficheiros</string>
+  <string name="file_list__footer__files_and_folder">%1$d ficheiros, 1 cartafol</string>
+  <string name="file_list__footer__files_and_folders">%1$d ficheiros, %2$d cartafoles</string>
 </resources>

res/values-id/strings.xml

@@ -69,6 +69,7 @@
   <string name="uploader_info_uploading">Mengunggah</string>
   <string name="file_list_seconds_ago">beberapa detik yang lalu</string>
   <string name="file_list_empty">Tidak ada apa-apa di sini. Unggah sesuatu!</string>
+  <string name="file_list_loading">Memuat...</string>
   <string name="local_file_list_empty">Tidak ada satupun berkas dalam folder ini.</string>
   <string name="filedetails_select_file">Sentuh pada berkas untuk menampilkan informasi tambahan</string>
   <string name="filedetails_size">Ukuran:</string>
@@ -315,4 +316,12 @@
   <string name="auth_host_address">Alamat server</string>
   <string name="common_error_out_memory">Memori tidak cukup</string>
   <string name="username">Nama pengguna</string>
+  <string name="file_list__footer__folder">1 folder</string>
+  <string name="file_list__footer__folders">%1$d folder</string>
+  <string name="file_list__footer__file">1 berkas</string>
+  <string name="file_list__footer__file_and_folder">1 berkas, 1 folder</string>
+  <string name="file_list__footer__file_and_folders">1 berkas, %1$d folder</string>
+  <string name="file_list__footer__files">%1$d berkas</string>
+  <string name="file_list__footer__files_and_folder">%1$d berkas, 1 folder</string>
+  <string name="file_list__footer__files_and_folders">%1$d berkas, %2$d folder</string>
 </resources>

res/values-it/strings.xml

@@ -69,6 +69,7 @@
   <string name="uploader_info_uploading">Caricamento in corso</string>
   <string name="file_list_seconds_ago">secondi fa</string>
   <string name="file_list_empty">Non c\'è niente qui. Carica qualcosa!</string>
+  <string name="file_list_loading">Caricamento in corso...</string>
   <string name="local_file_list_empty">Non ci sono file in questa cartella.</string>
   <string name="filedetails_select_file">Tocca un file per visualizzare informazioni aggiuntive.</string>
   <string name="filedetails_size">Dimensione:</string>
@@ -315,4 +316,12 @@
   <string name="auth_host_address">Indirizzo del server</string>
   <string name="common_error_out_memory">Memoria insufficiente</string>
   <string name="username">Nome utente</string>
+  <string name="file_list__footer__folder">1 cartella</string>
+  <string name="file_list__footer__folders">%1$d cartelle</string>
+  <string name="file_list__footer__file">1 file</string>
+  <string name="file_list__footer__file_and_folder">1 file, 1 cartella</string>
+  <string name="file_list__footer__file_and_folders">1 file, %1$d cartelle</string>
+  <string name="file_list__footer__files">%1$d file</string>
+  <string name="file_list__footer__files_and_folder">%1$d file, 1 cartella</string>
+  <string name="file_list__footer__files_and_folders">%1$d file, %2$d cartelle</string>
 </resources>

res/values-nb-rNO/strings.xml

@@ -69,6 +69,7 @@
   <string name="uploader_info_uploading">Laster opp</string>
   <string name="file_list_seconds_ago">for få sekunder siden</string>
   <string name="file_list_empty">Ingenting her. Last opp noe!</string>
+  <string name="file_list_loading">Laster...</string>
   <string name="local_file_list_empty">Det er ingen filer i denne mappen.</string>
   <string name="filedetails_select_file">Trykk på en fil for å vise ekstra informasjon.</string>
   <string name="filedetails_size">Størrelse:</string>
@@ -315,4 +316,12 @@
   <string name="auth_host_address">Server-adresse</string>
   <string name="common_error_out_memory">Ikke nok minne</string>
   <string name="username">Brukernavn</string>
+  <string name="file_list__footer__folder">1 mappe</string>
+  <string name="file_list__footer__folders">%1$d mapper</string>
+  <string name="file_list__footer__file">1 fil</string>
+  <string name="file_list__footer__file_and_folder">1 fil, 1 mappe</string>
+  <string name="file_list__footer__file_and_folders">1 fil, %1$d mapper</string>
+  <string name="file_list__footer__files">%1$d filer</string>
+  <string name="file_list__footer__files_and_folder">%1$d filer, 1 mappe</string>
+  <string name="file_list__footer__files_and_folders">%1$d filer, %2$d mapper</string>
 </resources>

res/values-nl/strings.xml

@@ -70,6 +70,7 @@ Download hier: %2$s</string>
   <string name="uploader_info_uploading">Uploaden</string>
   <string name="file_list_seconds_ago">seconden geleden</string>
   <string name="file_list_empty">Er bevindt zich hier niets. Upload een bestand!</string>
+  <string name="file_list_loading">Laden...</string>
   <string name="local_file_list_empty">Er staan geen bestanden in deze map.</string>
   <string name="filedetails_select_file">Druk op een bestand om extra informatie weer te geven</string>
   <string name="filedetails_size">Grootte:</string>
@@ -318,4 +319,12 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar
   <string name="auth_host_address">Serveradres</string>
   <string name="common_error_out_memory">Niet voldoende geheugen</string>
   <string name="username">Gebruikersnaam</string>
+  <string name="file_list__footer__folder">1 map</string>
+  <string name="file_list__footer__folders">%1$d mappen</string>
+  <string name="file_list__footer__file">1 bestand</string>
+  <string name="file_list__footer__file_and_folder">1 bestand, 1 map</string>
+  <string name="file_list__footer__file_and_folders">1 bestand, %1$d mappen</string>
+  <string name="file_list__footer__files">%1$d bestanden</string>
+  <string name="file_list__footer__files_and_folder">%1$d bestanden, 1 map</string>
+  <string name="file_list__footer__files_and_folders">%1$d bestanden, %2$d mappen</string>
 </resources>

res/values-pt-rBR/strings.xml

@@ -69,6 +69,7 @@
   <string name="uploader_info_uploading">Enviando</string>
   <string name="file_list_seconds_ago">segundos atrás</string>
   <string name="file_list_empty">Nada aqui. Envie alguma coisa!</string>
+  <string name="file_list_loading">Carregando...</string>
   <string name="local_file_list_empty">Não existe nenhum arquivo nesta pasta.</string>
   <string name="filedetails_select_file">Toque em um arquivo para mostrar informações adicionais.</string>
   <string name="filedetails_size">Tamanho:</string>
@@ -315,4 +316,12 @@
   <string name="auth_host_address">Endereço do servidor</string>
   <string name="common_error_out_memory">Não há memoria suficiente</string>
   <string name="username">Nome do Usuário</string>
+  <string name="file_list__footer__folder">1 pasta</string>
+  <string name="file_list__footer__folders">%1$d pastas</string>
+  <string name="file_list__footer__file">1 arquivo</string>
+  <string name="file_list__footer__file_and_folder">1 arquivo, 1 pasta</string>
+  <string name="file_list__footer__file_and_folders">1 arquivo, %1$d pastas</string>
+  <string name="file_list__footer__files">%1$d arquivos</string>
+  <string name="file_list__footer__files_and_folder">%1$d arquivos, 1 pasta</string>
+  <string name="file_list__footer__files_and_folders">%1$d arquivos, %2$d pastas</string>
 </resources>

res/values-th-rTH/strings.xml

@@ -69,6 +69,7 @@
   <string name="uploader_info_uploading">กำลังอัพโหลด</string>
   <string name="file_list_seconds_ago">วินาที ก่อนหน้านี้</string>
   <string name="file_list_empty">ยังไม่มีไฟล์ใดๆเลย ลองอัปโหลดดูสิ!</string>
+  <string name="file_list_loading">กำลังโหลด...</string>
   <string name="local_file_list_empty">ยังไม่มีไฟล์ในโฟลเดอร์นี้</string>
   <string name="filedetails_select_file">แตะที่ไฟล์ เพื่อแสดงข้อมูลเพิ่มเติม</string>
   <string name="filedetails_size">ขนาด:</string>
@@ -313,4 +314,12 @@
   <string name="auth_host_address">ที่อยู่เซิร์ฟเวอร์</string>
   <string name="common_error_out_memory">หน่วยความจำไม่พอ</string>
   <string name="username">ชื่อผู้ใช้</string>
+  <string name="file_list__footer__folder">1 โฟลเดอร์</string>
+  <string name="file_list__footer__folders">%1$d โฟลเดอร์</string>
+  <string name="file_list__footer__file">1 ไฟล์</string>
+  <string name="file_list__footer__file_and_folder">1 ไฟล์, 1 โฟลเดอร์</string>
+  <string name="file_list__footer__file_and_folders">1 ไฟล์, %1$d โฟลเดอร์</string>
+  <string name="file_list__footer__files">%1$d ไฟล์</string>
+  <string name="file_list__footer__files_and_folder">%1$d ไฟล์, 1 โฟลเดอร์</string>
+  <string name="file_list__footer__files_and_folders">%1$d ไฟล์, %2$d โฟลเดอร์</string>
 </resources>

res/values-uk/strings.xml

@@ -68,6 +68,7 @@
   <string name="uploader_info_uploading">Завантаження</string>
   <string name="file_list_seconds_ago">секунди тому</string>
   <string name="file_list_empty">Тут нічого немає. Відвантажте що-небудь!</string>
+  <string name="file_list_loading">Завантаження…</string>
   <string name="local_file_list_empty">В цій теці немає файлів.</string>
   <string name="filedetails_select_file">Натисніть на файлі для відображення додаткової інформації</string>
   <string name="filedetails_size">Розмір:</string>
@@ -296,9 +297,18 @@
   <string name="prefs_category_security">Безпека</string>
   <string name="prefs_instant_video_upload_path_title">Шлях завантаження відео</string>
   <string name="download_folder_failed_content">Скачування теки %1$s не може бути завершено</string>
+  <string name="with_you_subject_header">з Вами</string>
   <string name="subject_token">%1$s поділився \"%2$s\" з вами</string>
   <string name="auth_refresh_button">Оновити з\'єднання</string>
   <string name="auth_host_address">Ареса серверу</string>
   <string name="common_error_out_memory">Недостатньо пам\'яті</string>
   <string name="username">Ім\'я користувача</string>
+  <string name="file_list__footer__folder">1 тека</string>
+  <string name="file_list__footer__folders">%1$d тек</string>
+  <string name="file_list__footer__file">1 файл</string>
+  <string name="file_list__footer__file_and_folder">1 файл, 1 тека</string>
+  <string name="file_list__footer__file_and_folders">1 файл, %1$d тек</string>
+  <string name="file_list__footer__files">%1$d файлів</string>
+  <string name="file_list__footer__files_and_folder">%1$d файлів, 1 тека</string>
+  <string name="file_list__footer__files_and_folders">%1$d файлів, %2$d тек</string>
 </resources>