mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-19 15:33:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse source
This commit is contained in:
Tobias Kaminsky 2024-07-27 02:31:07 +02:00
commit e396493a98
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
View file

@ -899,6 +899,10 @@ public class ReceiveExternalFilesActivity extends FileActivity
}
public void uploadFiles() {
if (mStreamsToUpload == null) {
DisplayUtils.showSnackMessage(this, R.string.receive_external_files_activity_unable_to_find_file_to_upload);
return;
}
UriUploader uploader = new UriUploader(
this,

6
app/src/main/res/values-ko/strings.xml
View file

@ -479,7 +479,7 @@
<string name="link_name">링크 이름</string>
<string name="link_share_allow_upload_and_editing">업로드와 수정 허용</string>
<string name="link_share_editing">글 수정</string>
<string name="link_share_file_drop">업로드만 허용</string>
<string name="link_share_file_drop">파일 업로드 전용</string>
<string name="link_share_view_only">읽기 전용</string>
<string name="list_layout">목록 보기</string>
<string name="load_more_results">더 많은 결과 불러오기</string>
@ -757,8 +757,8 @@
<string name="share_no_password_title">비밀번호 설정</string>
<string name="share_not_allowed_when_file_drop">업로드 전용 보안 공유는 재공유가 허용되지 않습니다</string>
<string name="share_password_title">비밀번호로 보호</string>
<string name="share_permission_can_edit">수정할 수 있음</string>
<string name="share_permission_file_drop">업로드만 허용</string>
<string name="share_permission_can_edit">편집 허용</string>
<string name="share_permission_file_drop">파일 업로드 전용</string>
<string name="share_permission_secure_file_drop">안전한 파일 공유</string>
<string name="share_permission_view_only">읽기 전용</string>
<string name="share_permissions">공유 권한</string>

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

@ -452,6 +452,7 @@
<string name="clipboard_label">Text copied from %1$s</string>
<string name="receive_external_files_activity_start_sync_folder_is_not_exists_message">Folder cannot be found, sync operation is cancelled</string>
<string name="receive_external_files_activity_unable_to_find_file_to_upload">Unable to find file to upload</string>
<string name="error_cant_bind_to_operations_service">Critical error: Unable to perform operations</string>