Merge branch 'master' into issue2040

build.gradle

@@ -101,8 +101,8 @@ android {
             versionDev {
                 applicationId "com.nextcloud.android.beta"
                 dimension "default"
-                versionCode 20180207
-                versionName "20180207"
+                versionCode 20180208
+                versionName "20180208"
             }
         }
     }

src/generic/fastlane/metadata/android/fr-FR/full_description.txt

@@ -1,19 +1,18 @@
-L'application Open Source Nextcloud Android vous permet d'accéder à tous vos fichiers stockés sur Nextcloud.
+L'application, libre de copie, Nextcloud pour Android, vous donne accès à tous les fichiers dans votre Nextcloud.
+Fonctionnalitées :
+* Interface moderne et simple d'utilisation, adapté au thème de votre serveur
+* Envoyer des fichiers sur votre serveur Nextcloud
+* Partage de fichiers avec d'autres personnes
+* Conserver vos fichiers et dossiers favoris synchronisés
+* Rechercher parmis tout vos dossiers sur votre serveur
+* Envoi automatisé de vos photos et vidéos prises sur vos appareils
+* Rester à jour avec vos notifications
+* Utilisation de plusieurs comptes
+* Accès sécurisé à vos données avec votre empreinte digitale ou code PIN
+* Intégration avec DAVdroid pour une synchronisation facile des contacts & agenda
 
-Fonctionnalités :
-* Interface facile d'utilisation et moderne, personnalisée avec le même thème que celui du serveur
-* Envoyez vos fichiers sur votre serveur Nextcloud
-* Partagez vos fichiers avec d'autres personnes
-* Synchronisez vos fichiers et dossiers favoris
-* Recherchez parmi tous vos dossiers situés sur votre serveur
-* Téléversez automatiquement les photos et vidéos prises avec votre appareil
-* Restez à jour grâce aux notifications
-* Gestion du multi comptes
-* Accès sécurisé à vos données avec votre empreinte digitale ou un code pin
-* Intégration avec DAVdroid pour faciliter l'installation de la synchronisation du Calendrier & des Contacts
+S'il vous plait, rapporter les bogues à l'adresse suivante : https://github.com/nextcloud/android/issues et parler de cette application à l'adresse suivante : https://help.nextcloud.com/c/clients/android
 
-Merci de signaler tout problème sur https://github.com/nextcloud/android/issues et venez discuter de cette application sur https://help.nextcloud.com/c/clients/android
+Nouveau sur Nextcloud? Nextcloud est un serveur privé de synchronisation & partage de fichier, et de communication. C'est un logiciel libre, et vous pouvez héberger vous même ou payez une companie pour le faire pour vous. Vous êtes en total contrôle de vos photos, votre calendrier, vos contacts, vos documents et tout le reste.
 
-Vous découvrez Nextcloud ? Nextcloud est un système de synchronisation de fichiers personnels & un serveur de partage. Ce système est entièrement Open Source. Vous pouvez l'héberger vous-même ou payer une entreprise pour ce service. Vous aurez ainsi le contrôle de vos photos, votre calendrier, vos données de contacts, vos documents et de tout le reste.
-
-Pour en savoir plus, consultez le site Nextcloud sur https://nextcloud.com
+Allez voir Nextcloud à l'adresse suivante https://nextcloud.com

src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java

@@ -209,7 +209,7 @@ public class FilesystemDataProvider {
         return dataSet;
     }
 
-    private static long getFileChecksum(String filepath) {
+    private long getFileChecksum(String filepath) {
 
         InputStream inputStream = null;
         try {

src/main/res/values-bg-rBG/strings.xml

@@ -241,33 +241,62 @@
 	<string name="auth_timeout_title">Сървърът се забави прекалено много с отговора</string>
 	<string name="auth_incorrect_address_title">Грешен формат на адреса на сървъра</string>
 	<string name="auth_ssl_general_error_title">Неуспешна инициализация на SSL</string>
+	<string name="auth_ssl_unverified_server_title">Не може да потвърди самоличността на сървъра</string>
 	<string name="auth_bad_oc_version_title">Неизвестна версия на сървъра</string>
 	<string name="auth_wrong_connection_title">Не може да се осъществи връзка</string>
 	<string name="auth_secure_connection">Осъществена е сигурна връзка.</string>
 	<string name="auth_unauthorized">Грешно потребителско име или парола</string>
 	<string name="auth_oauth_error">Неуспешна оторизация</string>
 	<string name="auth_oauth_error_access_denied">Достъпът е отказан от оторизиращия сървър</string>
+	<string name="auth_wtf_reenter_URL">Неочаквано състояние. Моля, въведете адреса на сървъра отново</string>
 	<string name="auth_expired_oauth_token_toast">Оторизацията изтече. Моля, оторизирайте се отново.</string>
 	<string name="auth_expired_basic_auth_toast">Моля въведете текущата парола</string>
 	<string name="auth_expired_saml_sso_token_toast">Сесията изтече. Моля, свържете се отново</string>
-    <string name="auth_unsupported_multiaccount">%1$s не поддържа множество профили</string>
+    <string name="auth_connecting_auth_server">Свързване към сървър за идентификация &#8230;</string>
+	<string name="auth_unsupported_multiaccount">%1$s не поддържа множество профили</string>
+	<string name="auth_fail_get_user_name">Вашият сървър не връща правилен потребителски индентификатор. Моля, свържете се с администратора</string>
 	<string name="auth_can_not_auth_against_server">Неуспешно идентифициране към сървъра</string>
+    <string name="auth_account_does_not_exist">Профилът все още не съществува на устройството</string>
+    <string name="auth_access_failed">Влизането беше неуспешно</string>
+
     <string name="favorite">Задай като достъпна офлайн</string>
     <string name="unfavorite">Отмяна като достъпна офлайн</string>
+    <string name="favorite_real">Сложи като любим</string>
+    <string name="unset_favorite_real">Премахни от любими</string>
+    <string name="favorite_switch">Достъпно онлайн</string>
+    <string name="encrypted">Включване на криптиране</string>
+    <string name="unset_encrypted">Премахни криптиране</string>
     <string name="common_rename">Преименуване</string>
+    <string name="common_remove">Изтриване</string>
+    <string name="confirmation_remove_file_alert">Наистина ли искате да изтриете %1$s ?</string>
+    <string name="confirmation_remove_folder_alert">Наистина ли желаете %1$s и съдържанието им да бъдат изтрити?</string>
     <string name="confirmation_remove_local">Само локално</string>
+    <string name="remove_success_msg">Изтрито</string>
+    <string name="remove_fail_msg">Изтриването неуспешно</string>
     <string name="rename_dialog_title">Въведете ново име</string>
+    <string name="rename_local_fail_msg">Локално копие не може да бъде преименувано; опитайте с друго име</string>
+    <string name="rename_server_fail_msg">Сървърът не може да бъде преименуван</string>
     <string name="sync_file_nothing_to_do_msg">Съдържанието на файла е вече синхронизирано</string>
+    <string name="create_dir_fail_msg">Не може да се създаде папка</string>
     <string name="filename_forbidden_characters">Забранени символи: / \\ &lt; &gt; : \" | ? *</string>
+    <string name="filename_forbidden_charaters_from_server">Името на файла съдържа поне един невалиден символ</string>
+    <string name="filename_empty">Името на файла не може да бъде празно</string>
+    <string name="wait_a_moment">Зареждане на данни &#8230;</string>
     <string name="wait_checking_credentials">Проверка на съхранените пълномощия</string>
+    <string name="filedisplay_no_file_selected">Не сте избрали файл</string>
     <string name="activity_chooser_title">Изпращане на връзката чрез &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Копиране на файла от личното хранилище</string>
     
+    <string name="oauth_check_onoff">Влизане с OAuto 2.0</string>
+    <string name="oauth_login_connection">Свързване към OAuth 2.0 server &#8230;</string>
+        
+    <string name="ssl_validator_header">Самоличността на сървъра не може да бъде потвърдена</string>
     <string name="ssl_validator_reason_cert_not_trusted">- Сертификатът на сървъра не е надежден</string>
     <string name="ssl_validator_reason_cert_expired">- Сертификатът на сървъра е изтекъл</string>
     <string name="ssl_validator_reason_cert_not_yet_valid">- Датите на валидност на сървърния сертификат са в бъдещето</string>
     <string name="ssl_validator_reason_hostname_not_verified">- URL адресът не съвпада с името на сървъра от сертификата</string>
     <string name="ssl_validator_question">Желаете ли да се доверите на сертификата, въпреки това?</string>
+    <string name="ssl_validator_not_saved">Неуспешно запазване на сертификат</string>
     <string name="ssl_validator_btn_details_see">Детайли</string>
     <string name="ssl_validator_btn_details_hide">Скриване</string>
     <string name="ssl_validator_label_subject">Издаден на:</string>
@@ -291,24 +320,38 @@
 
     <string name="placeholder_sentence">Това е за запазено място</string>
     <string name="placeholder_filename">placeholder.txt</string>
+    <string name="placeholder_fileSize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
 
+    <string name="auto_upload_on_wifi">Качване само при Wi-Fi връзка</string>
+    <string name="instant_upload_on_charging">Качвай само при зареждане</string>
     <string name="instant_upload_path">/InstantUpload</string>
+    <string name="auto_upload_path">/AutoUpload</string>
     <string name="conflict_title">Файлов конфликт</string>
+    <string name="conflict_message">Кои файлове желаете да запазите? Ако изберете и двете версии, към името на локалния файл ще бъде добавено число.</string>
     <string name="conflict_keep_both">Запазване и на двата</string>
     <string name="conflict_use_local_version">локалната версия</string>
     <string name="conflict_use_server_version">версията на сървъра</string>
 
+    <string name="preview_sorry">Извиняваме се </string>
     <string name="preview_image_description">Преглед на изображението</string>
+    <string name="preview_image_error_unknown_format">Съобщението не може да бъде показано</string>
+    <string name="preview_image_error_no_local_file">Няма локален файл за преглед</string>
+
     <string name="error__upload__local_file_not_copied">%1$s не може да бъде копиран в локалната папка %2$s</string>
+    <string name="prefs_synced_folders_local_path_title">Локална папка</string>
+    <string name="prefs_synced_folders_remote_path_title">Отдалечена папка</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Ползване на подпапки</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Съхраняване в подпапки, разделени по година и месец</string>
 
+	<string name="share_link_no_support_share_api">За съжаление споделянето не е включено на сървъра ви. 
+Моля, свържете се с администратора.</string>
 	<string name="share_link_file_no_exist">Неуспешен опит за споделяне. Моля, проверете съществува ли файла</string>
 	<string name="share_link_file_error">Възникна грешка при опита за споделяне на файл или папка</string>
 	<string name="unshare_link_file_no_exist">Неуспешен опит за прекратяване на споделянето. Проверете съществува ли файла</string>
 	<string name="unshare_link_file_error">Възникна грешка при опита за прекратяване на споделянето на файл или папка</string>
+    <string name="update_link_file_no_exist">Обновяването беше неуспешно. Моля, проверете дали файлът съществува</string>
     <string name="update_link_file_error">Възникна грешка при опита за обновяване на споделянето</string>
     <string name="share_link_password_title">Въведете парола</string>
     <string name="share_link_empty_password">Трябва да въведете парола</string>

src/main/res/values-et-rEE/strings.xml

@@ -368,8 +368,8 @@
     <string name="share_privilege_can_edit_change">muuda</string>
     <string name="share_privilege_can_edit_delete">kustuta</string>
 
-    <string name="action_switch_grid_view">Võrgustikuvaade</string>
-    <string name="action_switch_list_view">kirjavaade</string>
+    <string name="action_switch_grid_view">Ruudustikvaade</string>
+    <string name="action_switch_list_view">Nimekirjavaade</string>
 
     <string name="manage_space_title">Ruumi haldamine</string>
     <string name="manage_space_clear_data">Tühjenda andmed</string>

src/main/res/values-fr/strings.xml

@@ -189,6 +189,10 @@ Attention la suppression est irréversible.</string>
         <item quantity="other">Impossible de synchroniser %1$d fichiers ( conflits : %2$d)</item>
     </plurals>
     <string name="sync_foreign_files_forgotten_ticker">Certains fichiers locaux ont été ignorés</string>
+    <plurals name="sync_foreign_files_forgotten_content">
+        <item quantity="one">Copie échoué du fichier %1$d depuis le dossier %2$s dans</item>
+        <item quantity="other">Copie échoué des fichiers %1$d depuis le dossier %2$s dans</item>
+    </plurals>
     <string name="sync_foreign_files_forgotten_explanation">Depuis la version 1.3.16, les fichiers envoyés depuis cet appareil sont copiés dans le dossier local %1$s pour éviter une perte de données lorsqu\'un même fichier est synchronisé avec plusieurs comptes.\n\nEn raison de cette modification, tous les fichiers envoyés avec des versions antérieures de cette application ont été copiés dans le dossier %2$s. Cependant, une erreur a empêché l\'achèvement de cette opération pendant la synchronisation du compte. Vous pouvez soit laisser les fichiers tels quels et supprimer le lien vers %3$s, soit déplacer les fichiers dans le dossier %1$s et garder le lien vers %4$s.\n\nCi-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxquels ils étaient liés.</string>
     <string name="sync_current_folder_was_removed">Le dossier %1$s n\'existe plus</string>
     <string name="foreign_files_move">Tout déplacer</string>
@@ -590,6 +594,7 @@ Veuillez contacter votre administrateur</string>
     <string name="whats_new_end_to_end_encryption_title">Chiffrement de bout en bout</string>
     <string name="whats_new_end_to_end_encryption_content">Choisissez quels dossiers à chiffrer depuis n\'importe quel client. Ajoutez facilement de nouveaux appareils en utilisant votre phrase secrète à 12 mots</string>
     <string name="whats_new_resized_images_title">Image adaptée à l\'écran</string>
+    <string name="whats_new_resized_images_content">Version plus petite montré par défaut, comme elle sauvegarde les données et fonctionne bien pour l\'envoi &amp; partage. Vous pouvez télécharger le fichier complet sur zooming</string>
     <string name="whats_new_ipv6_title">Prise en charge de l\'IPV6</string>
     <string name="whats_new_ipv6_content">Fonctionne maintenant correctement avec les serveurs supportant l\'IPV6, tout en prenant en charge également l\'IPV4</string>
 
@@ -664,6 +669,8 @@ Veuillez contacter votre administrateur</string>
     <string name="resized_images_download_full_image">Télécharger l\'image originale ?</string>
 
     <string name="store_short_desc">L\'application Android Nextcloud donne un accès mobile à tous les fichiers sur votre Nextcloud</string>
+    <string name="store_full_desc">L\'application, libre de copie, Nextcloud pour Android, vous donne accès à tous les fichiers dans votre Nextcloud.\nFonctionnalitées :\n* Interface moderne et simple d\'utilisation, adapté au thème de votre serveur\n* Envoyer des fichiers sur votre serveur Nextcloud\n* Partage de fichiers avec d\'autres personnes\n* Conserver vos fichiers et dossiers favoris synchronisés\n* Rechercher parmis tout vos dossiers sur votre serveur\n* Envoi automatisé de vos photos et vidéos prises sur vos appareils\n* Rester à jour avec vos notifications\n* Utilisation de plusieurs comptes\n* Accès sécurisé à vos données avec votre empreinte digitale ou code PIN\n* Intégration avec DAVdroid pour une synchronisation facile des contacts &amp; agenda\n\nS\'il vous plait, rapporter les bogues à l\'adresse suivante : https://github.com/nextcloud/android/issues et parler de cette application à l\'adresse suivante : https://help.nextcloud.com/c/clients/android\n\nNouveau sur Nextcloud? Nextcloud est un serveur privé de synchronisation &amp; partage de fichier, et de communication. C\'est un logiciel libre, et vous pouvez héberger vous même ou payez une companie pour le faire pour vous. Vous êtes en total contrôle de vos photos, votre calendrier, vos contacts, vos documents et tout le reste.\n\nAllez voir Nextcloud à l\'adresse suivante https://nextcloud.com</string>
+
     <string name="drawer_current_account">Compte Courrant</string>
     <string name="drawer_middle_account">Compte du milieu</string>
     <string name="drawer_end_account">Dernier compte</string>
@@ -696,6 +703,8 @@ Veuillez contacter votre administrateur</string>
     <string name="what_s_new_image">Image quoi de neuf</string>
 
     <string name="store_short_dev_desc">Nextcloud Dev est une version de travail qui peut être installée en parallèle.</string>
+    <string name="store_full_dev_desc">L\'application, libre de copie, Nextcloud pour Android, vous donne accès à tous les fichiers dans votre Nextcloud.\nC\'est la version officielle de développement, comportant un échantillon quotidien de toutes les nouvelles fonctionnalités non testées, qui peut causer l\'instabilité et la perte de données. L\'application est destinée aux utilisateurs qui souhaitent tester et signaler les bogues s\'ils surviennent. Ne l\'utilisez pas pour votre travail productif ! \n\nLa version officielle de développement et la version régulière sont disponibles sur F-droid, et peuvent être installées en même temps. </string>
+
     <string name="prefs_category_dev">Dév</string>
     <string name="dev_version_no_information_available">Aucune information disponible.</string>
     <string name="dev_version_no_new_version_available">Aucune nouvelle version disponible.</string>
@@ -748,4 +757,5 @@ Veuillez contacter votre administrateur</string>
     <string name="end_to_end_encryption_dialog_close">Fermer</string>
     <string name="end_to_end_encryption_storing_keys">Enregistrement des clés</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Copier/déplacer dans ce dossier chiffré n\'est pas actuellement supporté</string>
-    </resources>
+    <string name="untrusted_domain">Accès depuis un domaine non fiable. S\'il vous plaît consultez la documentation pour plus d\'informations</string>
+</resources>

src/main/res/values-zh-rCN/strings.xml

@@ -47,6 +47,7 @@
     <string name="prefs_log_delete_history_button">删除历史</string>
     <string name="prefs_calendar_contacts">同步日历 &amp; 联系人</string>
     <string name="prefs_calendar_contacts_summary">为当前账户设置 DAVdroid (v1.3.0+)</string>
+    <string name="prefs_calendar_contacts_address_resolve_error">DAVdroid无法解析该账户的服务器地址</string>
     <string name="prefs_calendar_contacts_no_store_error">F-droid 和 Google Play 都没有安装</string>
     <string name="prefs_calendar_contacts_sync_setup_successful">日历 &amp; 联系人同步设置</string>
     <string name="prefs_daily_contacts_sync_summary">联系人每日备份</string>
@@ -103,6 +104,7 @@
     <string name="file_list_empty_recently_modified">在过去的7天内没有被修改过的文件</string>
     <string name="file_list_empty_recently_modified_filter">过去7天内没有修改过文件.</string>
     <string name="file_list_empty_recently_added">没找到最近添加的文件</string>
+    <string name="file_list_empty_recently_added_filter">没有最近添加的文件。</string>
     <string name="file_list_empty_text_photos">上传一些照片或启用自动上传。</string>
     <string name="file_list_empty_text_photos_filter">没有照片。</string>
     <string name="file_list_empty_text_videos">上传一些视频或启动自动上传</string>
@@ -351,6 +353,8 @@
 
     <string name="error_cant_bind_to_operations_service">严重错误：无法执行操作</string>
 
+    <string name="network_error_socket_exception">连接到服务器时发生错误。</string>
+    <string name="network_error_connect_timeout_exception">等待服务器时发生错误。 无法完成操作。</string>
     <string name="network_host_not_available">无法完成操作。 服务器无法使用</string>
 
     <string name="forbidden_permissions">您不允许%s</string>
@@ -367,11 +371,19 @@
     <string name="file_migration_preparing">准备迁移 &#8230;</string>
     <string name="file_migration_checking_destination">检查目的地 &#8230;</string>
     <string name="file_migration_saving_accounts_configuration">保存帐户配置 &#8230;</string>
+    <string name="file_migration_waiting_for_unfinished_sync">等待完整同步&#8230;</string>
     <string name="file_migration_migrating">正在转移数据 &#8230;</string>
     <string name="file_migration_updating_index">更新目录 &#8230;</string>
     <string name="file_migration_cleaning">清除 &#8230;</string>
+    <string name="file_migration_restoring_accounts_configuration">正在恢复账户设置&#8230;</string>
     <string name="file_migration_ok_finished">完成</string>
+    <string name="file_migration_failed_not_enough_space">需要更多空间</string>
+    <string name="file_migration_failed_not_writable">无法写入目标文件</string>
     <string name="file_migration_failed_not_readable">无法读取源文件</string>
+    <string name="file_migration_failed_dir_already_exists">Nextcloud 目录已存在</string>
+    <string name="file_migration_failed_while_coping">迁移失败</string>
+    <string name="file_migration_failed_while_updating_index">更新索引失败</string>
+
     <string name="file_migration_override_data_folder">代替</string>
     <string name="file_migration_use_data_folder">使用</string>
 
@@ -387,6 +399,7 @@
 	<string name="log_send_mail_subject">%1$s Android 程序日志</string>
 	<string name="log_progress_dialog_text">加载数据 &#8230;</string>
 
+	<string name="saml_authentication_required_text">需要密码</string>
 	<string name="saml_authentication_wrong_pass">错误密码</string>
 	<string name="actionbar_move">移动</string>
     <string name="actionbar_copy">复制</string>
@@ -618,6 +631,7 @@
 
     <string name="drawer_current_account">当前账户</string>
     <string name="drawer_middle_account">移动端账户</string>
+    <string name="drawer_end_account">最后一个账户</string>
     <string name="activity_icon">动态图标</string>
     <string name="file_icon">文件图标</string>
     <string name="user_icon">用户图标</string>
@@ -631,7 +645,11 @@
     <string name="shared_icon">已共享图标</string>
     <string name="share_file_icon">共享文件图标</string>
     <string name="sort_by_name_ascending">按名字升序排序</string>
+    <string name="sort_by_modification_date_ascending">按时间顺序</string>
+    <string name="sort_by_size_descending">文件从大到小排序</string>
+    <string name="sort_by_size_ascending">文件从小到大排序</string>
     <string name="sort_by_name_descending">按名字降序排序</string>
+    <string name="sort_by_modification_date_descending">按时间倒序</string>
     <string name="synced_folders_type">类型</string>
     <string name="sync_status_button">同步状态按钮</string>
     <string name="synced_folder_settings_button">设置按钮</string>
@@ -643,6 +661,7 @@
     <string name="dev_version_no_information_available">没有可用的信息</string>
     <string name="dev_version_no_new_version_available">没有可用的新版本</string>
     <string name="folder_icon">目录图标</string>
+    <string name="dev_version_new_version_available">新版本可用</string>
     <string name="version_dev_download">下载</string>
 
     <string name="send">发送</string>
@@ -663,4 +682,9 @@
     <string name="screenshot_05_autoUpload">自动上传照片&amp;/视频 </string>
     <string name="account_icon">账户图标</string>
     
+    <string name="end_to_end_encryption_folder_not_empty">此文件夹不是空的。</string>
+    <string name="end_to_end_encryption_decrypting">解密中&#8230;</string>
+    <string name="end_to_end_encryption_title">设置加密</string>
+    <string name="end_to_end_encryption_confirm_button">设置加密</string>
+    <string name="end_to_end_encryption_dialog_close">关闭</string>
     </resources>

src/main/res/values-zh-rTW/strings.xml

@@ -64,6 +64,7 @@
     <string name="auth_host_url">伺服器網址 https://&#8230;</string>
     <string name="auth_username">使用者名稱</string>
     <string name="auth_password">密碼</string>
+    <string name="auth_register">還沒有 Nextcloud？\n點選這裡來選擇供應商</string>
     <string name="sync_string_files">檔案</string>
     <string name="setup_btn_connect">連線</string>
     <string name="uploader_btn_upload_text">上傳</string>
@@ -89,6 +90,7 @@
     <string name="file_list_empty">上傳一些項目或與你的設備同步！</string>
     <string name="file_list_empty_favorites_filter_list">您標記為最愛的檔案與資料夾將會顯示在這裡</string>
     <string name="file_list_empty_favorites_filter">您搜尋的結果顯示無已收藏檔案。</string>
+    <string name="file_list_loading">載入中 &#8230;</string>
     <string name="file_list_no_app_for_file_type">未設定處理此檔案類型適用的APP</string>
     <string name="local_file_list_empty">這個資料夾中沒有任何檔案</string>
     <string name="local_folder_list_empty">沒有其他資料夾了</string>
@@ -100,16 +102,23 @@
     <string name="file_list_empty_headline_server_search_videos">沒有影片</string>
     <string name="file_list_empty_headline_server_search_photos">無圖片</string>
     <string name="file_list_empty_search">說不定它在其他的資料夾?</string>
+    <string name="file_list_empty_recently_modified">沒有找到最近 7 日修改的檔案</string>
+    <string name="file_list_empty_recently_modified_filter">在 7 天內沒有修改的檔案。</string>
     <string name="file_list_empty_recently_added">近期無新增檔案</string>
+    <string name="file_list_empty_recently_added_filter">近期無新增檔案</string>
     <string name="file_list_empty_text_photos">上傳些照片或者啟用自動上傳功能。</string>
+    <string name="file_list_empty_text_photos_filter">無圖片。</string>
     <string name="file_list_empty_text_videos">上傳些影片或者啟用自動上傳功能</string>
+    <string name="file_list_empty_text_videos_filter">沒有影片。</string>
     <string name="upload_list_empty_headline">沒有上傳的檔案</string>
     <string name="upload_list_empty_text_auto_upload">上傳一些聯絡人或者啟用自動上傳</string>
     <string name="file_list_folder">資料夾</string>
     <string name="filedetails_select_file">在檔案上輕觸來顯示更多資訊</string>
     <string name="filedetails_download">下載</string>
+    <string name="filedetails_sync_file">同步</string>
     <string name="filedetails_renamed_in_upload_msg">上傳過程中檔案%1$s被重新命名</string>
     <string name="list_layout">清單顯示</string>
+    <string name="action_send_share">傳送/分享</string>
     <string name="common_yes">是</string>
     <string name="common_no">否</string>
     <string name="common_ok">好</string>
@@ -117,6 +126,7 @@
     <string name="common_cancel">取消</string>
     <string name="common_back">返回</string>
     <string name="common_save">儲存</string>
+    <string name="common_error">錯誤</string>
     <string name="common_loading">載入中&#8230;</string>
     <string name="common_unknown">未知</string>
     <string name="common_error_unknown">未知的錯誤</string>
@@ -136,8 +146,11 @@
     <string name="uploader_upload_succeeded_content_single">%1$s 已上傳</string>
     <string name="uploader_upload_failed_ticker">上傳失敗</string>
     <string name="uploader_upload_failed_content_single">上傳 %1$s 無法完成</string>
+    <string name="uploader_upload_failed_credentials_error">上傳失敗，再重新登入</string>
+    <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">不信任的伺服器憑證</string>
     <string name="uploads_view_title">上傳</string>
     <string name="uploads_view_group_current_uploads">目前</string>
+    <string name="uploads_view_group_failed_uploads">失敗/等待重啟</string>
     <string name="uploads_view_group_finished_uploads">已上傳</string>
     <string name="uploads_view_upload_status_succeeded">完成</string>
     <string name="uploads_view_upload_status_cancelled">已取消</string>
@@ -150,6 +163,7 @@
     <string name="uploads_view_upload_status_conflict">衝突</string>
     <string name="uploads_view_upload_status_service_interrupted">APP 中斷運作</string>
     <string name="uploads_view_upload_status_unknown_fail">未知的錯誤</string>
+    <string name="uploads_view_upload_status_waiting_for_wifi">等待 Wi-Fi</string>
     <string name="uploads_view_upload_status_waiting_exit_power_save_mode">等待省電模式解除</string>
     <string name="uploads_view_later_waiting_to_upload">上傳等候中</string>
     <string name="downloader_download_in_progress_ticker">下載中&#8230;</string>
@@ -159,6 +173,7 @@
     <string name="downloader_download_failed_ticker">下載失敗</string>
     <string name="downloader_download_failed_content">下載 %1$s 無法完成 </string>
     <string name="downloader_not_downloaded_yet">尚未下載</string>
+    <string name="downloader_download_failed_credentials_error">下載失敗，再重新登入</string>
     <string name="common_choose_account">選擇帳戶</string>
     <string name="common_switch_account">使用其他帳號</string>
     <string name="sync_fail_ticker">同步失敗</string>

src/main/res/values/strings.xml

@@ -116,7 +116,7 @@
     <string name="filedetails_select_file">Tap on a file to display additional information.</string>
     <string name="filedetails_download">Download</string>
     <string name="filedetails_sync_file">Sync</string>
-    <string name="filedetails_renamed_in_upload_msg">File renamed to %1$s during upload</string>
+    <string name="filedetails_renamed_in_upload_msg">File renamed %1$s during upload</string>
     <string name="list_layout">Listed layout</string>
     <string name="action_send_share">Send/Share</string>
     <string name="common_yes">Yes</string>
@@ -279,7 +279,7 @@
     <string name="remove_success_msg">Deleted</string>
     <string name="remove_fail_msg">Deletion failed</string>
     <string name="rename_dialog_title">Enter a new name</string>
-    <string name="rename_local_fail_msg">Local copy could not be renamed, try a different name</string>
+    <string name="rename_local_fail_msg">Could not rename local copy, try a different name</string>
     <string name="rename_server_fail_msg">Renaming not possible, name already taken</string>
     <string name="sync_file_nothing_to_do_msg">File contents already synchronized</string>
     <string name="create_dir_fail_msg">Could not create folder</string>
@@ -589,7 +589,7 @@
     <string name="storage_description_default">Default</string>
 
     <!-- What's new feature and texts to show -->
-    <string name="whats_new_title">What\'s new in %1$s</string>
+    <string name="whats_new_title">New in %1$s</string>
 
     <!-- Welcome to Nc intro features -->
     <string name="welcome_feature_1_title">A safe home for all your data</string>
@@ -601,12 +601,12 @@
     <string name="welcome_feature_3_title">Auto upload</string>
     <string name="welcome_feature_3_text">Keep your photos safe</string>
 
-    <string name="whats_new_end_to_end_encryption_title">End to end encryption</string>
-    <string name="whats_new_end_to_end_encryption_content">Choose which folders to encrypt, set up from any client. Easily add new devices using a 12 word passphrase.</string>
-    <string name="whats_new_resized_images_title">Screen adapted images</string>
-    <string name="whats_new_resized_images_content">Smaller version is shown by default, as it saves data and works nicely for sending &amp; sharing. You can download the whole file on zooming.</string>
+    <string name="whats_new_end_to_end_encryption_title">End-to-end encryption</string>
+    <string name="whats_new_end_to_end_encryption_content">Tap to encrypt, from any client. Add new ones by copying 12 words over.</string>
+    <string name="whats_new_resized_images_title">Adaptive images</string>
+    <string name="whats_new_resized_images_content">Small images are fast and work great for sharing. Zoom in to download a full version.</string>
     <string name="whats_new_ipv6_title">IPv6 support</string>
-    <string name="whats_new_ipv6_content">Now works nicely with servers supporting IPv6, while supporting IPv4 at the same time.</string>
+    <string name="whats_new_ipv6_content">IPv6 when the server supports it, IPv4 if not.</string>
 
     <string name="whats_new_skip">Skip</string>
 
@@ -765,9 +765,9 @@
     <string name="end_to_end_encryption_not_supported">Encryption only works on KitKat(4.4) and beyond.</string>
     <string name="end_to_end_encryption_confirm_button">Set up encryption</string>
     <string name="end_to_end_encryption_password">Password&#8230;</string>
-    <string name="end_to_end_encryption_unsuccessful">Keys could not be stored, please try again.</string>
+    <string name="end_to_end_encryption_unsuccessful">Could not save keys, please try again.</string>
     <string name="end_to_end_encryption_dialog_close">Close</string>
     <string name="end_to_end_encryption_storing_keys">Storing keys</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Copy/move into encrypted folder currently not supported.</string>
-    <string name="untrusted_domain">Access through untrusted domain. Please see documentation for further infos.</string>
+    <string name="untrusted_domain">Access through untrusted domain. Please see documentation for further info.</string>
 </resources>

src/versionDev/fastlane/metadata/android/fr-FR/full_description.txt

@@ -1,4 +1,4 @@
 L'application, libre de copie, Nextcloud pour Android, vous donne accès à tous les fichiers dans votre Nextcloud.
 C'est la version officielle de développement, comportant un échantillon quotidien de toutes les nouvelles fonctionnalités non testées, qui peut causer l'instabilité et la perte de données. L'application est destinée aux utilisateurs qui souhaitent tester et signaler les bogues s'ils surviennent. Ne l'utilisez pas pour votre travail productif ! 
 
-La version officielle de développement et la version régulière sont disponibles sur F-droid, et peuvent être installées en même temps.
+La version officielle de développement et la version régulière sont disponibles sur F-droid, et peuvent être installées en même temps.