Merged the latest changes

This commit is contained in:
Avently 2020-07-21 01:37:36 +03:00
commit 06e70abb86
47 changed files with 102 additions and 115 deletions

View file

@ -355,7 +355,7 @@
<string name="action_settings">Settings</string>
<string name="action_about">About</string>
<string name="title_licenses">Third-party Licenses</string>
<string name="copyright" formatted="true">© %1$s by %2$s under %3$s</string>
<string name="copyright">© %1$s by %2$s under %3$s</string>
<string name="error_unable_to_load_license">Could not load license</string>
<string name="action_open_website">Open website</string>
<string name="tab_about">About</string>
@ -594,7 +594,7 @@
<string name="clear_download_history">Clear download history</string>
<string name="confirm_prompt">Do you want to clear your download history or delete all downloaded files?</string>
<string name="delete_downloaded_files">Delete downloaded files</string>
<string name="deleted_downloads">Deleted %1$s downloads</string>
<string name="deleted_downloads">Deleted %1$d downloads</string>
<string name="stop">Stop</string>
<string name="max_retry_msg">Maximum retries</string>
<string name="max_retry_desc">Maximum number of attempts before canceling the download</string>