Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Conflict resolution.

Browse source
This commit is contained in:
krtkush 2018-12-28 18:07:54 +05:30
commit b674006fcc
77 changed files with 8269 additions and 2352 deletions
Download patch file Download diff file Expand all files Collapse all files

50
app/src/main/res/values/strings.xml
View file

@ -144,6 +144,7 @@
<string name="popup_resizing_indicator_title">Resizing</string>
<string name="best_resolution">Best resolution</string>
<string name="undo">Undo</string>
<string name="file_deleted">File deleted</string>
<string name="play_all">Play All</string>
<string name="always">Always</string>
<string name="just_once">Just Once</string>
@ -244,8 +245,6 @@
<string name="audio">Audio</string>
<string name="retry">Retry</string>
<string name="storage_permission_denied">Storage access permission denied</string>
<string name="use_old_player_title">Use old player</string>
<string name="use_old_player_summary">Old built-in Mediaframework player</string>
<string name="short_thousand">K</string>
<string name="short_million">M</string>
@ -539,4 +538,51 @@
<string name="app_update_notification_content_title">NewPipe Update Available!</string>
<string name="app_update_notification_content_text">Tap to download</string>
<string name="missions_header_finished">Finished</string>
<string name="missions_header_pending">In queue</string>
<string name="paused">paused</string>
<string name="queued">queued</string>
<string name="post_processing">post-processing</string>
<string name="enqueue">Queue</string>
<string name="permission_denied">Action denied by the system</string>
<!-- download notifications -->
<string name="download_failed">Download failed</string>
<string name="download_finished">Download finished</string>
<string name="download_finished_more">%s downloads finished</string>
<!-- dialog about existing downloads -->
<string name="generate_unique_name">Generate unique name</string>
<string name="overwrite">Overwrite</string>
<string name="overwrite_warning">A downloaded file with this name already exists</string>
<string name="download_already_running">There is a download in progress with this name</string>
<!-- message dialog about download error -->
<string name="show_error">Show error</string>
<string name="label_code">Code</string>
<string name="error_path_creation">The file can not be created</string>
<string name="error_file_creation">The destination folder can not be created</string>
<string name="error_permission_denied">Permission denied by the system</string>
<string name="error_ssl_exception">Secure connection failed</string>
<string name="error_unknown_host">Can not found the server</string>
<string name="error_connect_host">Can not connect to the server</string>
<string name="error_http_no_content">The server does not send data</string>
<string name="error_http_unsupported_range">The server does not accept multi-threaded downloads, retry with @string/msg_threads = 1</string>
<string name="error_http_requested_range_not_satisfiable">Requested Range Not Satisfiable</string>
<string name="error_http_not_found">Not found</string>
<string name="error_postprocessing_failed">Post-processing failed</string>
<string name="clear_finished_download">Clear finished downloads</string>
<string name="msg_pending_downloads">You have %s pending downloads, goto Downloads to continue</string>
<string name="stop">Stop</string>
<string name="max_retry_msg">Maximum retry</string>
<string name="max_retry_desc">Maximum number of attempts before canceling the download</string>
<string name="pause_downloads_on_mobile">Pause on switching to mobile data</string>
<string name="pause_downloads_on_mobile_desc">Not all downloads can be suspended, in those cases, will be restarted</string>
</resources>