mirror of
https://github.com/nextcloud/android.git
synced 2024-12-22 00:34:31 +03:00
Merge remote-tracking branch 'origin/master' into dev
This commit is contained in:
commit
3a7a4c403c
2 changed files with 2 additions and 1 deletions
|
@ -933,6 +933,7 @@
|
||||||
<string name="unread_comments">Unread comments exist</string>
|
<string name="unread_comments">Unread comments exist</string>
|
||||||
<string name="unset_encrypted">Unset encryption</string>
|
<string name="unset_encrypted">Unset encryption</string>
|
||||||
<string name="unset_favorite">Remove from favourites</string>
|
<string name="unset_favorite">Remove from favourites</string>
|
||||||
|
<string name="unset_internal_two_way_sync_description">Remove folder from internal two way sync</string>
|
||||||
<string name="unshare_link_file_error">An error occurred while trying to unshare this file or folder.</string>
|
<string name="unshare_link_file_error">An error occurred while trying to unshare this file or folder.</string>
|
||||||
<string name="unshare_link_file_no_exist">Unable to unshare. Please check whether the file exists.</string>
|
<string name="unshare_link_file_no_exist">Unable to unshare. Please check whether the file exists.</string>
|
||||||
<string name="unshare_link_forbidden_permissions">to unshare this file</string>
|
<string name="unshare_link_forbidden_permissions">to unshare this file</string>
|
||||||
|
|
|
@ -253,7 +253,7 @@
|
||||||
<string name="downloader_download_file_not_found">Ce fichier n\'est plus disponible sur le serveur</string>
|
<string name="downloader_download_file_not_found">Ce fichier n\'est plus disponible sur le serveur</string>
|
||||||
<string name="downloader_download_in_progress">%1$d%% %2$s</string>
|
<string name="downloader_download_in_progress">%1$d%% %2$s</string>
|
||||||
<string name="downloader_download_in_progress_content">Téléchargement de %2$s : %1$d%% effectués</string>
|
<string name="downloader_download_in_progress_content">Téléchargement de %2$s : %1$d%% effectués</string>
|
||||||
<string name="downloader_download_in_progress_ticker">Réception en cours…</string>
|
<string name="downloader_download_in_progress_ticker">Téléchargement…</string>
|
||||||
<string name="downloader_download_succeeded_content">%1$s reçu</string>
|
<string name="downloader_download_succeeded_content">%1$s reçu</string>
|
||||||
<string name="downloader_download_succeeded_ticker">Reçu</string>
|
<string name="downloader_download_succeeded_ticker">Reçu</string>
|
||||||
<string name="downloader_file_download_cancelled">Certains fichiers ont été annulés pendant le téléchargement par l\'utilisateur</string>
|
<string name="downloader_file_download_cancelled">Certains fichiers ont été annulés pendant le téléchargement par l\'utilisateur</string>
|
||||||
|
|
Loading…
Reference in a new issue