mirror of
https://github.com/nextcloud/android.git
synced 2024-12-19 15:33:00 +03:00
Merge remote-tracking branch 'origin/master' into dev
This commit is contained in:
commit
c5876e499b
3 changed files with 3 additions and 0 deletions
|
@ -353,6 +353,7 @@ class FileDownloadWorker(
|
|||
|
||||
private fun checkDownloadError(result: RemoteOperationResult<*>) {
|
||||
if (result.isSuccess || downloadError != null) {
|
||||
notificationManager.dismissNotification()
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
@ -922,6 +922,7 @@
|
|||
<string name="upload_action_cancelled_resume">إستئناف المرفوعات الملغاة</string>
|
||||
<string name="upload_action_failed_clear">مسح الملفات التي فشل رفعها</string>
|
||||
<string name="upload_action_failed_retry">أعِد محاولات الرفع الفاشلة</string>
|
||||
<string name="upload_action_file_not_exist_message">بعض الملفات لم تعُد موجودة. عمليات الرفع هذه لا يمكن استئنافها.</string>
|
||||
<string name="upload_action_global_upload_pause">جمِّد كل عمليات الرفع</string>
|
||||
<string name="upload_action_global_upload_resume">إستَأنِف عمليات الرفع</string>
|
||||
<string name="upload_cannot_create_file">لا يمكن إنشاء ملف محلي</string>
|
||||
|
|
|
@ -896,6 +896,7 @@
|
|||
<string name="upload_action_cancelled_resume">繼續已取消的上傳</string>
|
||||
<string name="upload_action_failed_clear">清除失敗的上傳</string>
|
||||
<string name="upload_action_failed_retry">重試未成功的上傳項目</string>
|
||||
<string name="upload_action_file_not_exist_message">部份檔案不再存在。無法繼續這些上傳。</string>
|
||||
<string name="upload_action_global_upload_pause">暫停所有上傳</string>
|
||||
<string name="upload_action_global_upload_resume">繼續所有上傳</string>
|
||||
<string name="upload_cannot_create_file">無法建立本機檔案</string>
|
||||
|
|
Loading…
Reference in a new issue