diff options
| author | ownClouders <devops@owncloud.com> | 2021-09-20 06:18:13 +0300 |
|---|---|---|
| committer | ownClouders <devops@owncloud.com> | 2021-09-20 06:18:13 +0300 |
| commit | b10ba1ea5ebcae961679a5113d7ac4f5d4eec9f8 (patch) | |
| tree | bc33266abf7f547e4690cede2cedcc426ec6140b /translations/client_ko.ts | |
| parent | 28e0a78b51755aecb552cdf5cfafcd1b183c2e1d (diff) | |
[tx] updated client translations from transifex [skip ci]
Diffstat (limited to 'translations/client_ko.ts')
| -rw-r--r-- | translations/client_ko.ts | 1999 |
1 files changed, 1028 insertions, 971 deletions
diff --git a/translations/client_ko.ts b/translations/client_ko.ts index 54f152fc0..f23590ad0 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -4,7 +4,7 @@ <message> <location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.ui" line="29"/> <source>Tomahawk Crash Reporter</source> - <translation type="unfinished"/> + <translation>토마호크 충돌 보고서</translation> </message> <message> <location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.ui" line="104"/> @@ -19,24 +19,24 @@ <message> <location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.ui" line="257"/> <source>Send this report</source> - <translation type="unfinished"/> + <translation>이 보고서 전송</translation> </message> <message> <location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.ui" line="264"/> <source>Don't send</source> - <translation type="unfinished"/> + <translation>전송 안함</translation> </message> <message> <location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.ui" line="284"/> <source>You can disable sending crash reports in the configuration dialog.</source> - <translation type="unfinished"/> + <translation>설정 대화상자에서 충돌 보고서 전송을 비활성화할 수 있습니다.</translation> </message> <message> <location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="112"/> <location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="119"/> <location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="155"/> <source>We cannot gather useful debug information on your system.</source> - <translation type="unfinished"/> + <translation>이 시스템에서 유용한 디버그 정보를 얻을 수 없습니다.</translation> </message> <message> <location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="113"/> @@ -50,17 +50,17 @@ <message> <location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="148"/> <source>Ready to send debug information (<a href="%1">view backtrace</a>).</source> - <translation type="unfinished"/> + <translation>디버그 정보 전송 준비 완료 (<a href="%1">백트레이스 보기</a>).</translation> </message> <message> <location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="164"/> <source>Gathering debug information...</source> - <translation type="unfinished"/> + <translation>디버그 정보 모으는 중...</translation> </message> <message> <location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="273"/> <source>Uploaded %L1 of %L2 KB.</source> - <translation type="unfinished"/> + <translation>%L1 / %L2 KB 업로드됨.</translation> </message> <message> <location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="300"/> @@ -70,42 +70,42 @@ <message> <location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="309"/> <source>Failed to send crash info.</source> - <translation type="unfinished"/> + <translation>충돌 정보 전송 실패.</translation> </message> </context> <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> - <translation type="unfinished"/> + <translation>현재 사용되고 있는 파일 명으로 %1 을(를) 개명할 수 없습니다. </translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>휴지통에 디렉토리를 만들수 없습니다.</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> - <translation type="unfinished"/> + <translation>'%1' 을(를) '%2' 로 이동할 수 없습니다</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>이 플랫폼에서는 휴지통으로 이동하지 않습니다.</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>'%1' 폴더를 삭제할 수 없음</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/> <source>Connection timed out</source> <translation>연결 시간 초과됨</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/> <source>Unknown error: network reply was deleted</source> <translation>알 수 없는 오류: 네트워크 응답이 삭제됨</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>서버 응답: "%1 %2" - "%3 %4"</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation type="unfinished"/> </message> @@ -242,8 +242,8 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="58"/> - <source>Re-open Browser </source> - <translation type="unfinished"/> + <source>Re-open Browser</source> + <translation>브라우저 다시 열기</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>취소</translation> </message> @@ -294,67 +294,67 @@ <translation><server>에 사용자 <user>(으)로 연결됨</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>계정이 설정되지 않았습니다.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>삭제</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>계정</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>동기화할 항목 선택</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>지금 강제 동기화</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>동기화 재시작</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>폴더 동기화 연결 제거</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>폴더를 만들 수 없음</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>로컬 폴더 <i>%1</i>을(를) 만들 수 없습니다.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>동기화 삭제 확인</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>폴더를 동기화에서 제거</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> - <translation type="unfinished"/> + <translation>가상 파일 지원을 비활성화하겠습니까?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -363,183 +363,183 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> - <translation type="unfinished"/> + <translation>지원 비활성화</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>동기화 진행 중</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>동기화가 진행 중입니다.<br/>진행을 종료하시겠습니까?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 사용 중</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1에 <i>%2</i>(으)로</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>%1에 연결되었습니다.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>서버 %1을(를) 임시로 사용할 수 없습니다.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>서버 %1이(가) 현재 관리 모드입니다.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>%1에서 로그아웃했습니다.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>%1에 연결 중...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>%2에 %1 연결이 없습니다.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>로그인</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>이 폴더는 너무 커서 동기화할 수 없습니다: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>이 폴더는 외부 저장소여서 동기화할 수 없습니다: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>이 폴더는 너무 크거나 외부 저장소여서 동기화할 수 없습니다: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>계정 삭제 확인</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>계정 <i>%1</i>의 연결을 삭제하시겠습니까?</p><p><b>메모:</b> 이 작업은 파일을 삭제하지 <b>않습니다.</b></p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>연결 삭제</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>폴더 열기</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>로그아웃</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> - <translation type="unfinished"/> + <translation>로컬 폴더 열기</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>브라우저에서 폴더 열기</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>동기화 다시 시작</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>동기화 일시 정지</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>가용성</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> - <translation type="unfinished"/> + <translation>가상 파일 지원 비활성화...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> - <translation type="unfinished"/> + <translation>가상 파일 지원 %1 활성화...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> - <translation type="unfinished"/> + <translation> (실험 기능)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>폴더 <i>%1</i>을(를) 동기화하지 않으시겠습니까?</p><p><b>메모:</b> 이 작업은 파일을 삭제하지 <b>않습니다.</b></p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%2 중 %1(%3%) 사용 중입니다. 네트워크 마운트 및 공유 폴더의 제한 사항은 다를 수 있습니다.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%2 중 %1 사용 중</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>저장소 사용량 정보가 없습니다.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> - <translation type="unfinished"/> + <translation>서버 버전 %1 은(는) 지원되지 않습니다! 자기 책임 하에 진행하기 바랍니다.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> - <translation type="unfinished"/> + <translation>브라우저에서 인증 획득하는 중.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> - <translation type="unfinished"/> + <translation>서버 설정 에러: %2 의 %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>%1 연결이 설정되지 않았습니다.</translation> </message> @@ -547,116 +547,123 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>로그아웃됨</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>연결 끊김</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>연결됨</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>서비스를 사용할 수 없음</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>관리 모드</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>네트워크 오류</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>설정 오류</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>인증 정보 요청 중</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>알 수 없는 계정 상태</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%2의 %1</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%2의 %1 (연결 끊김)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>활동</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation type="unfinished"/> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>계정</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>시간</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation>로컬 경로</translation> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>서버 활동</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>동기화 프로토콜</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>동기화되지 않음</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <source>Not Synced (%1)</source> <extracomment>%1 is the number of not synced files.</extracomment> <translation>동기화되지 않음 (%1)</translation> </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="613"/> - <source>The server activity list has been copied to the clipboard.</source> - <translation>서버 활동 목록이 클립보드에 복사되었습니다.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="617"/> - <source>The sync activity list has been copied to the clipboard.</source> - <translation>동기화 활동 목록이 클립보드에 복사되었습니다.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="620"/> - <source>The list of unsynced items has been copied to the clipboard.</source> - <translation>동기화되지 않은 항목 목록이 클립보드에 복사되었습니다.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="625"/> - <source>Copied to clipboard</source> - <translation>클립보드로 복사됨</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -668,140 +675,189 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>텍스트라벨</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>서버 활동</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>복사</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> - <translation>활동 목록을 클립보드로 복사합니다.</translation> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation>칼럼 크기 재 설정</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>알림</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <source>%n notifications(s) for %1.</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <source>%n notifications(s) for %1 and %2.</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>클립보드로 복사</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation>파일 브라우저에 보이기</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br>%1 계정에 활동이 활성화되지 않았습니다.</translation> </message> </context> <context> - <name>OCC::AddCertificateDialog</name> + <name>OCC::Application</name> <message> - <location filename="../src/gui/addcertificatedialog.ui" line="17"/> - <source>SSL client certificate authentication</source> - <translation>SSL 클라이언트 인증서 인증</translation> + <location filename="../src/gui/application.cpp" line="167"/> + <source>Continuing will mean <b>deleting these settings</b>.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.ui" line="23"/> - <source>This server probably requires a SSL client certificate.</source> - <translation>이 서버에 연결하려면 SSL 클라이언트 인증서가 필요할 수 있습니다.</translation> + <location filename="../src/gui/application.cpp" line="169"/> + <source>Continuing will mean <b>ignoring these settings</b>.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.ui" line="53"/> - <source>Certificate & Key (pkcs12) :</source> - <translation>인증서와 키(PKCS12):</translation> + <location filename="../src/gui/application.cpp" line="175"/> + <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.ui" line="44"/> - <source>Browse...</source> - <translation>찾아보기...</translation> + <location filename="../src/gui/application.cpp" line="182"/> + <source>Quit</source> + <translation>끝내기</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.ui" line="60"/> - <source>Certificate password :</source> - <translation>인증서 암호:</translation> + <location filename="../src/gui/application.cpp" line="183"/> + <source>Continue</source> + <translation>계속</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="305"/> + <source>Error accessing the configuration file</source> + <translation>설정 파일 접근 오류</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.ui" line="79"/> - <source>An encrypted pkcs12 bundle is strongly recommended as a copy will be stored in the configuration file.</source> + <location filename="../src/gui/application.cpp" line="306"/> + <source>There was an error while accessing the configuration file at %1.</source> + <translation>%1에 있는 설정 파일에 접근하는 중 오류가 발생했습니다.</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="309"/> + <source>Quit %1</source> + <translation>%1 끝내기</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="38"/> - <source>Select a certificate</source> - <translation>인증서 선택하기</translation> + <location filename="../src/gui/application.cpp" line="579"/> + <source>For more information, see http://www.owncloud.org</source> + <translation>자세한 정보는 http://www.owncloud.org 를 참조하기 바랍니다</translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.cpp" line="38"/> - <source>Certificate files (*.p12 *.pfx)</source> - <translation>인증서 파일 (*.p12 *.pfx)</translation> + <location filename="../src/gui/application.cpp" line="593"/> + <source>Show the settings dialog while starting.</source> + <translation>기동 시 설정 대화상자 보이기.</translation> </message> -</context> -<context> - <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> - <source>Continuing will mean <b>deleting these settings</b>.</source> + <location filename="../src/gui/application.cpp" line="594"/> + <source>Quit the running instance.</source> + <translation>실행 인스턴스 종료.</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="595"/> + <source>Write log to file (use - to write to stdout).</source> + <translation>파일에 로그 기록하기(stdout에 기록하려면 - 이용).</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="596"/> + <source>Write each sync log output in a new file in folder.</source> + <translation>각 동기화 로그 출력을 폴더의 새 파일에 기록.</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="597"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> - <source>Continuing will mean <b>ignoring these settings</b>.</source> + <location filename="../src/gui/application.cpp" line="598"/> + <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> - <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> + <location filename="../src/gui/application.cpp" line="599"/> + <source>Output debug-level messages in the log.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> - <source>Quit</source> - <translation>끝내기</translation> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> + <source>Override UI language.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> - <source>Continue</source> - <translation>계속</translation> + <location filename="../src/gui/application.cpp" line="602"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> - <source>Error accessing the configuration file</source> - <translation>설정 파일 접근 오류</translation> + <location filename="../src/gui/application.cpp" line="603"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> - <source>There was an error while accessing the configuration file at %1.</source> - <translation>%1에 있는 설정 파일에 접근하는 중 오류가 발생했습니다.</translation> + <location filename="../src/gui/application.cpp" line="606"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>ownCloud 끝내기</translation> + <location filename="../src/gui/application.cpp" line="606"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="635"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="648"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="657"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -828,51 +884,51 @@ This action will abort any currently running synchronization.</source> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>데이터베이스에 메타데이터 기록 중 오류</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>ownCloud 계정이 설정되지 않았음</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>이 클라이언트에 설정된 서버가 너무 오래됨</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>최신 서버로 업데이트한 다음 클라이언트를 다시 시작하십시오.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>인증 오류: 사용자 이름이나 암호가 잘못되었습니다.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>시간 제한</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>지정한 인증 정보가 올바르지 않음</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> + <source>Failed to parse credentials %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="481"/> + <location filename="../src/libsync/discoveryphase.cpp" line="502"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation type="unfinished"/> </message> @@ -880,27 +936,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="264"/> <source>Error while opening directory %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not accessible on client, permission denied</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="270"/> <source>Directory not found: %1</source> <translation>디렉토리 찾지못함: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="301"/> <source>Filename encoding is not valid</source> <translation>파일 이름 인코딩이 올바르지 않음</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="320"/> <source>Error while reading directory %1</source> <translation type="unfinished"/> </message> @@ -908,135 +964,135 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="181"/> <source>Local folder %1 does not exist.</source> <translation>로컬 폴더 %1이(가) 존재하지 않습니다.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 should be a folder but is not.</source> <translation>%1이(가) 폴더여야 하지만 그렇지 않습니다.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="185"/> <source>%1 is not readable.</source> <translation>%1을(를) 읽을 수 없습니다.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1이(가) 삭제되었습니다.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="465"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1이(가) 업데이트되었습니다.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="472"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1이(가) %2(으)로 이름이 변경되었습니다.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="479"/> <source>%1 has been moved to %2.</source> <translation>%1이(가) %2(으)로 이동되었습니다.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="449"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 및 %n개의 다른 파일이 삭제되었습니다.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="456"/> <source>%1 and %n other file(s) have been added.</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 추가됨.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="463"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 및 %n개 다른 파일이 업데이트되었습니다.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="470"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1이(가) %2(으)로 이름이 변경되었고 %n개의 다른 파일도 이름이 변경되었습니다.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="477"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1(이)가 %2(으)로 이동되었고 %n개의 다른 파일도 이동되었습니다.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="484"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 및 %n개 다른 파일이 동기화 시 충돌합니다.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="486"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 파일이 동기화 시 충돌합니다. 충돌 파일을 확인해 주십시오!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="491"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 및 %n개 다른 파일을 동기화하는 중 오류가 발생했습니다. 자세한 내용은 로그를 확인하십시오.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="493"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>오류가 발생하여 %1을(를) 동기화할 수 없습니다. 자세한 정보는 로그를 참조하십시오.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="499"/> <source>Sync Activity</source> <translation>동기화 활동</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="842"/> <source>Could not read system exclude file</source> <translation>시스템 제외 파일을 읽을 수 없음</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <location filename="../src/gui/folder.cpp" line="1085"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>%1MB 보다 큰 새 폴더 추가됨: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1049"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>A folder from an external storage has been added. </source> <translation>외부 저장소에 있는 폴더가 추가되었습니다. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1050"/> + <location filename="../src/gui/folder.cpp" line="1089"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>다운로드하려면 설정에서 선택하십시오.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1148"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1112"/> + <location filename="../src/gui/folder.cpp" line="1151"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1123"/> + <location filename="../src/gui/folder.cpp" line="1162"/> <source>Changes in synchronized folders could not be tracked reliably. This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default). @@ -1045,7 +1101,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1199"/> + <location filename="../src/gui/folder.cpp" line="1238"/> <source>All files in the sync folder '%1' folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to keep the files, they will be re-synced with the server if you have rights to do so. @@ -1056,7 +1112,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a 파일을 삭제하려면 파일 소유자가 아니라면 해당 파일을 사용할 수 없습니다.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1204"/> + <location filename="../src/gui/folder.cpp" line="1243"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1065,17 +1121,17 @@ If this was an accident and you decide to keep your files, they will be re-synce 만약 이 작업이 잘못되었고 파일을 보존하려면 서버에서 다시 동기화 됩니다.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1208"/> + <location filename="../src/gui/folder.cpp" line="1247"/> <source>Remove All Files?</source> <translation>모든 파일을 삭제하시겠습니까?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1251"/> <source>Remove all files</source> <translation>모든 파일 삭제</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1252"/> <source>Keep files</source> <translation>파일 유지</translation> </message> @@ -1083,110 +1139,127 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="354"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <source>Could not reset folder state</source> <translation>폴더 상태를 초기화할 수 없음</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>과거의 동기화 저널 '%1'을(를) 찾았으나 삭제할 수 없습니다. 사용 중인 프로그램이 없는지 확인하십시오.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1143"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation> (백업)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation> (백업 %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>정의되지 않은 상태입니다.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>동기화가 시작되기를 기다리는 중입니다.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>동기화 준비 중입니다.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>동기화 중입니다.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Sync was successful, unresolved conflicts.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>마지막 동기화가 성공했습니다.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>설치 오류입니다.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>사용자가 중단했습니다.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>동기화가 일시 정지되었습니다.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1(동기화 중지됨)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>올바른 폴더를 선택하지 않았습니다!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> + <source>The folder %1 is used in a folder sync connection!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <source>The selected path is not a folder!</source> <translation>선택한 경로가 폴더가 아닙니다!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1388"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>You have no permission to write to the selected folder!</source> <translation>선택한 폴더에 쓸 수 있는 권한이 없습니다!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1455"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>이미 서버와 이 로컬 폴더가 동기화되었습니다. 다른 로컬 폴더를 선택하십시오!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1435"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>로컬 폴더 %1이(가) 폴더 동기화 연결에 사용 중인 폴더를 포함하고 있습니다. 다른 폴더를 선택하십시오!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1441"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>로컬 폴더 %1이(가) 폴더 동기화 연결에 사용 중인 폴더에 포함되어 있습니다. 다른 폴더를 선택하십시오!</translation> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1434"/> + <source>%1 Please pick another one!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1510"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1196,7 +1269,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>폴더 동기화 연결 추가</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="299"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="293"/> <source>File</source> <translation>파일</translation> </message> @@ -1204,159 +1277,154 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="149"/> <source>You need to be connected to add a folder</source> <translation>폴더를 추가하려면 연결해야 합니다</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="151"/> <source>Click this button to add a folder to synchronize.</source> <translation>동기화할 폴더를 추가하려면 이 단추를 누르십시오.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="160"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="162"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1(%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="186"/> <source>Error while loading the list of folders from the server.</source> <translation>서버에서 폴더 목록을 불러오는 중 오류가 발생했습니다.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="228"/> <source>Virtual file support is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="248"/> <source>Signed out</source> <translation>로그아웃됨</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="189"/> <source>Fetching folder list from server...</source> <translation>서버로부터 폴더 목록을 가져오고 있습니다...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> <source>There are unresolved conflicts. Click for details.</source> <translation>해결하지 못한 충돌 사항이 있습니다. 자세한 정보를 보려면 누르십시오.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> - <source>Synchronizing VirtualFiles with local folder</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> - <source>Synchronizing with local folder</source> - <translation>로컬 폴더 동기화 중</translation> - </message> - <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="894"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="905"/> <source>Reconciling changes</source> <translation>변경 사항 조정 중</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="940"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="943"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>%1 동기화 중</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>다운로드 %1/초</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>업로드 %1/초</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="273"/> + <source>Local folder: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%2 %1 중(%4 중 %3)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="995"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%2 %1 중</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 남음, %2 중 %1, %4 중 %3 파일</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%2 중 %1, 파일 %4 중 %3</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/> <source>file %1 of %2</source> <translation>파일 %2 중 %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1073"/> <source>Waiting...</source> <translation>대기 중...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1075"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>다른 폴더 %n개 대기 중...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Preparing to sync...</source> <translation>동기화 준비 중...</translation> </message> @@ -1380,12 +1448,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="577"/> + <location filename="../src/gui/folderwizard.cpp" line="566"/> <source>Add Folder Sync Connection</source> <translation>폴더 동기화 연결 추가</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="568"/> <source>Add Sync Connection</source> <translation>동기화 연결 추가</translation> </message> @@ -1398,12 +1466,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>동기화할 로컬 폴더를 선택하려면 누르십시오.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="76"/> + <location filename="../src/gui/folderwizard.cpp" line="74"/> <source>Enter the path to the local folder.</source> <translation>로컬 폴더 경로를 입력하십시오.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="137"/> + <location filename="../src/gui/folderwizard.cpp" line="132"/> <source>Select the source folder</source> <translation>원본 폴더 선택</translation> </message> @@ -1411,52 +1479,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="185"/> + <location filename="../src/gui/folderwizard.cpp" line="180"/> <source>Create Remote Folder</source> <translation>원격 폴더 만들기</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="186"/> + <location filename="../src/gui/folderwizard.cpp" line="181"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>'%1' 아래에 생성할 새 폴더 이름을 입력하십시오:</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="216"/> + <location filename="../src/gui/folderwizard.cpp" line="210"/> <source>Folder was successfully created on %1.</source> <translation>%1에 폴더를 만들었습니다.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="220"/> <source>Authentication failed accessing %1</source> <translation>%1에 접근하는 중 인증 오류 발생</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="222"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>%1에 폴더를 만들 수 없습니다. 직접 확인하십시오.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="240"/> <source>Failed to list a folder. Error: %1</source> <translation>폴더 목록을 가져올 수 없습니다. 오류: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="328"/> + <location filename="../src/gui/folderwizard.cpp" line="321"/> <source>Choose this to sync the entire account</source> <translation>모든 계정을 동기화하려면 선택하십시오</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="440"/> + <location filename="../src/gui/folderwizard.cpp" line="431"/> <source>This folder is already being synced.</source> <translation>이 폴더가 이미 동기화 중입니다.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>이미 <i>%2</i>의 부모 폴더 <i>%1</i>을(를) 동기화하고 있습니다.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1464,17 +1532,17 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="477"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="477"/> <source> (experimental)</source> - <translation type="unfinished"/> + <translation> (실험 기능)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="509"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> @@ -1518,7 +1586,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::GETJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="335"/> + <location filename="../src/libsync/propagatedownload.cpp" line="334"/> <source>Connection Timeout</source> <translation>연결 시간 초과됨</translation> </message> @@ -1536,47 +1604,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>일반 설정</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>언어</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>숨김 파일 동기화</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>네트워크</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>업데이트</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>안정</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>정보</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>고급</translation> </message> @@ -1586,18 +1659,18 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>다음보다 큰 폴더 동기화 전에 확인</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>외부 저장소 동기화 전에 확인</translation> </message> @@ -1612,77 +1685,97 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>데스크톱 알림 표시(&D)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>무시된 파일 수정하기(&I)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>충돌 보고 도구 보기(&H)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>다시 시작하고 업데이트(&R)</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>업데이트 채널 변경할까요?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>경고</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>업데이트 채널 변경</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>취소</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="120"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>%1 암호를 입력하십시오:<br> <br>사용자: %2<br>계정: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="134"/> <source>Reading from keychain failed with error: '%1'</source> <translation>키 체인에서 읽어올 수 없음: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="141"/> <source>Enter Password</source> <translation>암호 입력</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="181"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation>웹 인터페이스에서 앱 암호를 요청하려면 <a href="%1">여기</a>를 누르십시오.</translation> </message> @@ -1765,69 +1858,22 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>문제점 목록</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>계정</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><필터 없음></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>폴더</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>경고 표시</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>무시한 파일 표시</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>문제점이 너무 많습니다. 일부 문제점만 표시합니다.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>문제점 목록을 클립보드로 복사합니다.</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>복사</translation> + <location filename="../src/gui/issueswidget.cpp" line="82"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation>%1 파일은 그 이름이 %2 에 의해 예약되어 있으므로 무시됩니다</translation> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>시간</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>파일</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>문제점</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="119"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation type="unfinished"/> </message> @@ -1896,6 +1942,19 @@ Note that using any logging command line options will override the settings.</so </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2090,73 +2149,72 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="258"/> <source>Error returned from the server: <em>%1</em></source> <translation>서버에서 오류 반환함: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="261"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>'token' 엔드포인트에 접근하는 중 오류 발생: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>서버에서 반환한 JSON을 처리할 수 없음: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="267"/> <source>Unsupported token type: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="269"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="271"/> <source>Unknown Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="295"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> + <location filename="../src/libsync/creds/oauth.cpp" line="546"/> + <source>Oauth2 Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="547"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="275"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>로그인 오류</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="328"/> + <location filename="../src/libsync/creds/oauth.cpp" line="331"/> + <location filename="../src/libsync/creds/oauth.cpp" line="337"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="342"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="381"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>잘못된 사용자</h1><p>현재 <em>%1</em> 사용자로 로그인되어 있지만, 계속 진행하려면 <em>%2</em> 사용자로 로그인해야 합니다.<br>다른 탭에서 %3에서 로그아웃한 다음 <a href='%4'>여기</a>를 눌러서 %2 사용자로 다시 로그인하십시오</p></translation> </message> @@ -2224,96 +2282,63 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="49"/> <source>Connect to %1</source> <translation>%1에 연결</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="50"/> <source>Setup local folder options</source> <translation>로컬 폴더 설정 옵션</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="61"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="55"/> <source>Connect...</source> <translation>연결...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="84"/> <source> (experimental)</source> - <translation type="unfinished"/> + <translation> (실험 기능)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="84"/> <source>Use &virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> - <source>%1 folder '%2' is synced to local folder '%3'</source> - <translation>%1 폴더 '%2'이(가) 로컬 폴더 '%3'(으)로 동기화됨</translation> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="166"/> + <source><p><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/> <source>Sync the folder '%1'</source> <translation>폴더 '%1' 동기화</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> - <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> - <translation><p><small><strong>경고:</strong> 로컬 폴더가 비어 있지 않습니다. 해결 방법을 선택하십시오!</small></p></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="207"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="241"/> + <source>Error</source> + <translation>오류</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="266"/> <source>Local Sync Folder</source> <translation>로컬 동기화 폴더</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="300"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="335"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>연결 실패</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>지정한 보안 서버에 연결할 수 없습니다. 어떻게 하시겠습니까?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>다른 URL 선택</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>암호화되지 않은 HTTP로 다시 시도(안전하지 않음)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>클라이언트 TLS 인증서 설정</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p><em>%1</em> 보안 서버에 연결할 수 없습니다. 어떻게 하시겠습니까?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2334,17 +2359,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>%1에 연결</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>내 브라우저에 로그인</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>클립보드에 링크 복사</translation> </message> @@ -2352,7 +2377,7 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudPropagator</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="696"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/> <source>File %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -2360,112 +2385,87 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>%1에 연결</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>%1 서버 설정</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="112"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation>이 URL은 암호화되어 있지 않기 때문에 안전하지 않습니다. 사용하는 것을 추천하지 않습니다.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="116"/> <source>This url is secure. You can use it.</source> <translation>이 URL은 안전합니다. 사용하셔도 됩니다.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="155"/> <source>&Next ></source> <translation>다음(&N) ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="186"/> <source>Invalid URL</source> <translation>잘못된 URL</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> - <source>Could not load certificate. Maybe wrong password?</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="191"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>%2의 %1에 연결할 수 없음:<br>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="208"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>%2의 %1에 연결하는 중 시간이 초과되었습니다.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>인증 정보를 포함한 서버 요청이 '%1'(으)로 넘어갔습니다. URL이 잘못되었거나 서버 설정이 잘못되었습니다.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>인증 정보를 포함한 WebDAV 요청의 응답이 잘못됨</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>서버에서 접근이 거부되었습니다. 접근 권한이 있는지 확인하려면 <a href="%1">여기</a>를 눌러서 웹 브라우저로 서비스에 접근하십시오.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="189"/> <source>Invalid URL</source> <translation>잘못된 URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="269"/> <source>Could not create local folder %1</source> <translation>로컬 폴더 %1을(를) 만들 수 없음</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> - <source>No remote folder specified!</source> - <translation>원격 폴더가 지정되지 않았습니다!</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Error: %1</source> <translation>오류: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>폴더 생성 작업이 HTTP 오류 %1을(를) 반환하였습니다</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="333"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>입력한 인증 정보가 잘못되어 원격 폴더를 만들 수 없습니다!<br/>뒤로 돌아가서 인증 정보를 확인하십시오.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>원격 폴더 %1을(를) 생성하는 중 오류 <tt>%2</tt>이(가) 발생했습니다.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="370"/> <source>Folder rename failed</source> <translation>폴더 이름 바꾸기 실패</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>폴더에 포함된 파일이나 다른 폴더를 다른 프로그램에서 사용하고 있어서 폴더를 삭제하고 백업할 수 없습니다. 폴더나 파일을 닫은 후 다시 시도를 누르거나 설치를 취소할 수 있습니다.</translation> </message> @@ -2473,22 +2473,22 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="92"/> <source>%1 Connection Wizard</source> <translation>%1 연결 마법사</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="251"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Enable experimental feature?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="265"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="286"/> <source>Enable experimental placeholder mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/> <source>When the "virtual files" mode is enabled no files will be downloaded initially. Instead, a tiny "%1" file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu. The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset. @@ -2499,171 +2499,140 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="266"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="287"/> <source>Stay safe</source> <translation type="unfinished"/> </message> </context> <context> - <name>OCC::OwncloudWizardResultPage</name> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="37"/> - <source>Everything set up!</source> - <translation>모두 설정되었습니다!</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="41"/> - <source>Open Local Folder</source> - <translation>로컬 폴더 열기</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="49"/> - <source>Open %1 in Browser</source> - <translation>브라우저에서 %1 열기</translation> - </message> -</context> -<context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>poll URL에서 잘못된 JSON 응답 받음</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>동기화 시 심볼릭 링크는 지원되지 않습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>파일이 무시 목록에 포함되어 있습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="251"/> <source>File names ending with a period are not supported on this file system.</source> <translation>이 파일 시스템은 점으로 끝나는 파일 이름을 지원하지 않습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="256"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>이 파일 시스템은 '%1' 글자를 포함하는 파일 이름을 지원하지 않습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="263"/> <source>File name contains at least one invalid character</source> <translation>파일 이름에 하나 이상의 사용할 수 없는 문자가 포함되어 있음</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="265"/> <source>The file name is a reserved name on this file system.</source> <translation>이 파일 이름은 현재 파일 시스템에서 예약된 이름입니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="274"/> <source>Filename contains trailing spaces.</source> <translation>파일 이름 끝에 공백이 있습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="277"/> <source>Filename is too long.</source> <translation>파일 이름이 너무 깁니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="280"/> <source>File/Folder is ignored because it's hidden.</source> <translation>파일이나 폴더가 숨김 상태이기 때문에 무시합니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="284"/> <source>Stat failed.</source> <translation>파일 정보를 읽을 수 없습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>충돌: 서버 버전을 다운로드했고, 로컬 복사본의 이름을 변경했으며 업로드하지 않았습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="291"/> <source>The filename cannot be encoded on your file system.</source> <translation>이 파일 이름을 현재 파일 시스템으로 인코딩할 수 없습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="294"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>size</source> <translation>크기</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="399"/> <source>permissions</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>etag</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="403"/> <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="407"/> <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1232"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1245"/> <source>Not allowed to remove, restoring</source> <translation>삭제가 허용되지 않음, 복원 중</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1159"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>"동기화할 항목 선택" 블랙리스트에 추가되어 있어서 거부됨</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1192"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>해당 폴더에 하위 폴더를 추가할 권한이 없어서 허용되지 않음</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1197"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>해당 폴더에 파일을 추가할 권한이 없어서 허용되지 않음</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1210"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>서버에서 읽기 전용으로 공유 중이어서 허용되지 않음, 복원 중</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1355"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1416"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation type="unfinished"/> </message> @@ -2671,136 +2640,152 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1010"/> - <source>Error writing metadata to the database</source> - <translation>데이터베이스에 메타데이터 기록 중 오류</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/> + <source>%1 the folder is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>로컬 파일 이름이 충돌하여 %1 파일을 다운로드할 수 없습니다!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> - <source>%1 is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="390"/> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>이 파일을 다운로드하면 로컬 디스크 공간이 제한 이하로 남게 됨</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>디스크에 남은 공간이 %1보다 적음</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>서버에서 파일이 삭제됨</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>파일을 완전히 다운로드할 수 없습니다.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>서버에서 알려 온 파일 크기가 %1이지만 다운로드한 파일이 비어 있습니다.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>로컬 파일 이름이 충돌하여 %1 파일을 저장할 수 없습니다!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>발견 이후 파일이 변경됨</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="931"/> + <location filename="../src/libsync/propagatedownload.cpp" line="967"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1028"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>데이터베이스에 메타데이터 기록 중 오류</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="959"/> + <source>File has changed since discovery</source> + <translation>발견 이후 파일이 변경됨</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>, 복원 실패: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>읽기 전용 공유에서 파일이나 폴더가 삭제되었지만 복원할 수 없습니다: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="146"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="141"/> <source>could not delete file %1, error: %2</source> <translation>%1 파일을 삭제할 수 없음, 오류: %2</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> - <source>Attention, possible case sensitivity clash with %1</source> - <translation>주의, %1와(과) 대소문자가 충돌할 수도 있습니다</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="156"/> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> - <source>could not create folder %1</source> - <translation>폴더 %1을(를) 만들 수 없음</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="175"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="179"/> - <source>Error writing metadata to the database</source> - <translation>데이터베이스에 메타데이터 기록 중 오류</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="178"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="162"/> + <source>could not create folder %1</source> + <translation>폴더 %1을(를) 만들 수 없음</translation> </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> - <source>Could not remove %1 because of a local file name clash</source> - <translation>로컬 파일 이름이 충돌하여 %1을(를) 삭제할 수 없음</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="94"/> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="216"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>로컬 파일 이름이 충돌하여 파일 %1의 이름을 %2(으)로 변경할 수 없음</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="223"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>데이터베이스에 메타데이터 기록 중 오류</translation> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="255"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="261"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="267"/> <source>Error setting pin state</source> <translation type="unfinished"/> </message> @@ -2808,7 +2793,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>서버에서 잘못된 HTTP 코드를 반환했습니다. 204를 예상했지만 '%1 %2'을(를) 받았습니다.</translation> </message> @@ -2816,30 +2801,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>서버에서 잘못된 HTTP 코드를 반환했습니다. 201을 예상했지만 '%1 %2'을(를) 받았습니다.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>데이터베이스에 메타데이터 기록 중 오류</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>서버에서 잘못된 HTTP 코드를 반환했습니다. 201을 예상했지만 "%1 %2"을(를) 받았습니다.</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>데이터베이스에 메타데이터 기록 중 오류</translation> @@ -2851,73 +2850,91 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/> + <source>Could not update file : %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>대소문자만 다른 파일 이름이 이미 존재하기 때문에 %1 파일을 업로드할 수 없습니다</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>파일이 제거됨</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>로컬 파일이 동기화 중 변경되었습니다. 다시 시작됩니다.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>로컬 파일이 동기화 중 변경되었습니다.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>%1을(를) 업로드하면 폴더 할당량을 초과함</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> - <translation>데이터베이스에 메타데이터 기록 중 오류</translation> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>%1을(를) 업로드하면 폴더 할당량을 초과함</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>로컬 파일이 동기화 중 삭제되었습니다.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>로컬 파일이 동기화 중 변경되었습니다.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>폴링 URL 없음</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>서버에서 예상하지 못한 응답 코드를 반환함(%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>서버에 파일 ID가 없음</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>서버에 ETag가 없음</translation> </message> @@ -2930,12 +2947,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <source>The local file was removed during sync.</source> <translation>로컬 파일이 동기화 중 삭제되었습니다.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>로컬 파일이 동기화 중 변경되었습니다.</translation> </message> @@ -2948,82 +2965,105 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>폴링 URL 없음</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>로컬 파일이 동기화 중 삭제되었습니다.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>로컬 파일이 동기화 중 변경되었습니다.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>서버에서 마지막 조각을 확인하지 않았습니다.(e-tag가 없음)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>폼</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>텍스트라벨</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>브라우저에서 열기</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>Time</source> <translation>시간</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>File</source> <translation>파일</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Folder</source> <translation>폴더</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> + <source>Issues</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Action</source> <translation>동작</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> <source>Size</source> <translation>크기</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/> + <source>Account</source> + <translation>계정</translation> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/> + <source>Status</source> + <translation>상태</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>폼</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>로컬 동기화 프로토콜</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>복사</translation> + <location filename="../src/gui/protocolwidget.cpp" line="84"/> + <source>Reset column sizes</source> + <translation>칼럼 크기 재 설정</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>활동 목록을 클립보드로 복사합니다.</translation> + <location filename="../src/gui/protocolwidget.cpp" line="93"/> + <source>Copy to clipboard</source> + <translation>클립보드로 복사</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="103"/> + <source>Show in file browser</source> + <translation>파일 부라우저에 보이기</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="114"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="127"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3062,7 +3102,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>동기화할 항목 선택</translation> </message> @@ -3090,13 +3130,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>크기</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>현재 서버에 하위 디렉터리가 없습니다.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>하위 폴더 목록을 불러오는 중 오류가 발생했습니다.</translation> </message> @@ -3104,7 +3144,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>닫기</translation> </message> @@ -3112,33 +3152,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SettingsDialog</name> <message> - <location filename="../src/gui/settingsdialog.cpp" line="198"/> + <location filename="../src/gui/settingsdialog.cpp" line="220"/> <source>Settings</source> <translation>설정</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="187"/> + <location filename="../src/gui/settingsdialog.cpp" line="209"/> <source>Activity</source> <translation>활동</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="176"/> + <location filename="../src/gui/settingsdialog.cpp" line="198"/> <source>Add account</source> <translation>계정 추가</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="233"/> + <location filename="../src/gui/settingsdialog.cpp" line="236"/> <source>Quit %1</source> <translation>%1 끝내기</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="237"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="363"/> <source>Account</source> <translation>계정</translation> </message> @@ -3156,62 +3196,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ShareDialog</name> <message> - <location filename="../src/gui/sharedialog.ui" line="22"/> + <location filename="../src/gui/sharedialog.ui" line="28"/> <source>TextLabel</source> <translation>텍스트라벨</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="37"/> + <location filename="../src/gui/sharedialog.ui" line="43"/> <source>share label</source> <translation>공유 이름표</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="14"/> + <location filename="../src/gui/sharedialog.ui" line="20"/> <source>Dialog</source> <translation>다이얼로그</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="59"/> + <location filename="../src/gui/sharedialog.ui" line="65"/> <source>ownCloud Path:</source> <translation>ownCloud 경로:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>%1 Sharing</source> <translation>%1 공유</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="102"/> <source>Folder: %2</source> <translation>폴더: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>The server does not allow sharing</source> <translation>서버에서 공유를 허용하지 않음</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="124"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>서버에서 최대로 사용 가능한 공유 권한 확인하는 중...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="182"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>공유 권한 없이 공유되었기 때문에 파일을 공유할 수 없습니다.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="196"/> <source>Users and Groups</source> <translation>사용자 및 그룹</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="203"/> <source>Public Links</source> <translation>공개 링크</translation> </message> @@ -3316,7 +3356,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>삭제</translation> </message> @@ -3351,28 +3391,28 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>새로 만들기...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>링크 공유 삭제 확인</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>공개 링크 공유 <i>%1</i>을(를) 삭제하시겠습니까?</p><p>메모: 이 작업은 취소할 수 없습니다.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>취소</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>공개 링크</translation> </message> @@ -3383,7 +3423,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>암호를 설정하십시오</translation> </message> @@ -3406,32 +3446,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>이 항목은 다른 사람이나 그룹과 공유되지 않았습니다</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>브라우저로 링크 열기</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>클립보드에 링크 복사</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>이메일로 링크 보내기</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>'%1'의 결과 없음</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>무언가를 여러분과 공유했습니다</translation> </message> @@ -3465,17 +3505,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>생성</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>변경</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>삭제</translation> </message> @@ -3492,18 +3532,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>%1(으)로 공유하기</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation type="unfinished"/> </message> @@ -3542,85 +3582,89 @@ This is a new, experimental mode. If you decide to use it, please report any iss %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>무언가를 여러분과 공유했습니다</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>공유...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>클립보드에 비밀 링크 복사</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>이메일로 비밀 링크 보내기...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>이 폴더는 재공유가 허가되지 않음</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>브라우저에서 열기</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>이름변경...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>이름 변경 후 업로드...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>이동 + 이름변경...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>삭제</translation> </message> @@ -3628,37 +3672,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"/> </message> @@ -3668,7 +3712,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"/> </message> @@ -3823,67 +3867,67 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>이 인증서 신뢰하기</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <location filename="../src/gui/sslerrordialog.cpp" line="61"/> <source>Untrusted Certificate</source> <translation>신뢰할 수 없는 인증서</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="132"/> + <location filename="../src/gui/sslerrordialog.cpp" line="128"/> <source>Cannot connect securely to <i>%1</i>:</source> <translation><i>%1</i>에 안전하게 연결할 수 없음:</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="166"/> + <location filename="../src/gui/sslerrordialog.cpp" line="162"/> <source>with Certificate %1</source> <translation>인증서 %1 사용</translation> </message> <message> + <location filename="../src/gui/sslerrordialog.cpp" line="171"/> + <location filename="../src/gui/sslerrordialog.cpp" line="173"/> <location filename="../src/gui/sslerrordialog.cpp" line="175"/> - <location filename="../src/gui/sslerrordialog.cpp" line="177"/> - <location filename="../src/gui/sslerrordialog.cpp" line="179"/> <source>&lt;not specified&gt;</source> <translation>&lt;지정되지 않음&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="176"/> + <location filename="../src/gui/sslerrordialog.cpp" line="196"/> <source>Organization: %1</source> <translation>조직: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="177"/> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Unit: %1</source> <translation>조직 단위: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="178"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Country: %1</source> <translation>국가: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <location filename="../src/gui/sslerrordialog.cpp" line="185"/> <source>Fingerprint (MD5): <tt>%1</tt></source> <translation>지문(MD5): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> + <location filename="../src/gui/sslerrordialog.cpp" line="186"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>지문(SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="188"/> <source>Effective Date: %1</source> <translation>유효 기간 시작: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="189"/> <source>Expiration Date: %1</source> <translation>만료 날짜: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="193"/> <source>Issuer: %1</source> <translation>발급자: %1</translation> </message> @@ -3891,73 +3935,71 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="185"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1(이전 오류로 건너뜀, %2에 다시 시도)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="389"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <translation>%1만 사용할 수 있으나 시작하려면 최소 %2이(가) 필요함</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="417"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation>로컬 동기화 데이터베이스를 열 수 없습니다. 동기화 폴더에 쓰기 권한이 있는지 확인하십시오.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1004"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>디스크 공간이 부족합니다: 남은 디스크 공간을 %1 이하로 떨어트리는 항목을 다운로드하지 않습니다.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1011"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>서버에 일부 파일을 업로드할 공간이 부족합니다.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="315"/> <source>Unresolved conflict.</source> <translation>해결하지 못한 충돌입니다.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="433"/> <source>Using virtual files with suffix, but suffix is not set</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="515"/> + <location filename="../src/libsync/syncengine.cpp" line="445"/> <source>Unable to read the blacklist from the local database</source> <translation>로컬 데이터베이스에서 블랙리스트를 읽을 수 없음</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="546"/> + <location filename="../src/libsync/syncengine.cpp" line="478"/> <source>Unable to read from the sync journal.</source> <translation>동기화 저널에서 읽을 수 없습니다.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="630"/> + <location filename="../src/libsync/syncengine.cpp" line="566"/> <source>Cannot open the sync journal</source> <translation>동기화 저널을 열 수 없음</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="986"/> <source>Aborted</source> <translation>중단됨</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3968,7 +4010,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="460"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -3994,74 +4036,84 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Vfs</name> <message> - <location filename="../src/common/vfs.cpp" line="73"/> + <location filename="../src/common/vfs.cpp" line="72"/> <source>The Virtual filesystem feature does not support a drive as sync root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/vfs.cpp" line="77"/> + <location filename="../src/common/vfs.cpp" line="76"/> <source>The Virtual filesystem feature requires a NTFS file system, %1 is using %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/vfs.cpp" line="81"/> + <location filename="../src/common/vfs.cpp" line="80"/> <source>The Virtual filesystem feature is not supported on network drives</source> - <translation type="unfinished"/> + <translation>네트워크 드라이버에서는 가상 파일 시스템 기능이 지원되지 않습니다</translation> </message> </context> <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>로그인하십시오</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="281"/> <source>Folder %1: %2</source> <translation>폴더 %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>There are no sync folders configured.</source> <translation>동기화 폴더가 설정되지 않았습니다.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Open in browser</source> <translation>브라우저에서 열기</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Log in...</source> <translation>로그인...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="683"/> + <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Log out</source> <translation>로그아웃</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="477"/> <source>Recent Changes</source> <translation>최근 바뀜</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="345"/> <source>Managed Folders:</source> <translation>관리된 폴더:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Open folder '%1'</source> <translation>폴더 '%1' 열기</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Open %1 in browser</source> <translation>브라우저에 %1 열기</translation> </message> @@ -4071,32 +4123,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="769"/> <source>Unknown status</source> <translation>알 수 없는 상태</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="771"/> <source>Settings...</source> <translation>설정...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="773"/> <source>Details...</source> <translation>자세한 정보...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="779"/> <source>Help</source> <translation>도움말</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Quit %1</source> <translation>%1 끝내기</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>%1에서 연결 끊김</translation> </message> @@ -4106,240 +4158,221 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>저원되지 않는 서버 버전</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>연결 끊김</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>일부 계정에서 연결 해제됨</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>다음 계정에서 연결 끊김:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>계정 %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>로그아웃됨</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>계정 동기화 비활성화됨</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> <source>Synchronization is paused</source> <translation>동기화가 일시 정지됨</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> - <source>Unresolved conflicts</source> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> + <source>Up to date (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> - <source>Error during synchronization</source> - <translation>동기화 오류 발생</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="307"/> <source>No sync folders configured</source> <translation>동기화 폴더가 설정되지 않았음</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="356"/> <source>Unpause all folders</source> <translation>모든 폴더 다시 시작</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="361"/> <source>Pause all folders</source> <translation>모든 폴더 일시 정지</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="662"/> <source>Unpause all synchronization</source> <translation>모든 동기화 다시 시작</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="664"/> <source>Unpause synchronization</source> <translation>동기화 다시 시작</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="672"/> <source>Pause all synchronization</source> <translation>모든 동기화 일시 정지</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="674"/> <source>Pause synchronization</source> <translation>동기화 일시 정지</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="681"/> <source>Log out of all accounts</source> <translation>모든 계정에서 로그아웃</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="689"/> <source>Log in to all accounts...</source> <translation>모든 계정에 로그인...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>New account...</source> <translation>새 계정...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="781"/> <source>About %1</source> <translation>%1 정보</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="814"/> <source>No items synced recently</source> <translation>최근에 동기화된 항목 없음</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="836"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="854"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>%2 중 %1 동기화 중(%3 남음)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Syncing %1 of %2</source> <translation>%2 중 %1 동기화 중</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 (%2 left)</source> <translation>%1 동기화 중(%2 남음)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1</source> <translation>%1 동기화 중</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>%1 (%2, %3)</source> <translation>%1(%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>최신 상태임</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="14"/> <source>Form</source> <translation>폼</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="136"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="558"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="569"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="108"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="207"/> <source>TextLabel</source> <translation>텍스트라벨</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="59"/> <source>Server</source> <translation>서버</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="482"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="469"/> <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source> <translation><html><head/><body><p>이 상자를 선택하면 서버에서 동기화를 시작할 때 로컬 폴더의 모든 내용을 삭제합니다.</p><p>로컬 폴더의 내용을 서버에 업로드해야 하면 선택하지 마십시오.</p></body></html></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="485"/> - <source>Start a &clean sync (Erases the local folder!)</source> - <translation>깨끗한 동기화 시작(로컬 폴더 내용을 삭제합니다!)(&C)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="193"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="165"/> <source>Ask for confirmation before synchroni&zing folders larger than</source> <translation>다음 크기 이상의 폴더를 동기화하기 전에 확인(&Z)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="182"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="219"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="191"/> <source>Ask for confirmation before synchronizing e&xternal storages</source> <translation>외부 저장소 동기화 전에 확인(&X)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="228"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/> <source>Choose what to sync</source> <translation>동기화할 항목 선택</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="273"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="276"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="245"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="248"/> <source><html><head/><body><p>When this option is selected, the wizard will close without synchronizing anything. You can use the &quot;Add Folder Sync Connection&quot; button from the account settings to choose which pair of local and remote folder you wish to synchronize</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="279"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="251"/> <source>Manually create folder sync connections </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="400"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="369"/> <source>&Local Folder</source> <translation>로컬 폴더(&L)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="441"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="410"/> <source>pbSelectLocalFolder</source> <translation>pbSelectLocalFolder</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="472"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="459"/> <source>&Keep local data</source> <translation>로컬 데이터 유지(&K)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="472"/> + <source>Start a &clean sync (Crreate a backup and erases the local folder!)</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> - <source>Status message</source> - <translation>상태 메시지</translation> - </message> </context> <context> <name>OwncloudHttpCredsPage</name> @@ -4349,12 +4382,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>폼</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="54"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/> <source>&Username</source> <translation>사용자 이름(&U)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="64"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/> <source>&Password</source> <translation>암호(&P)</translation> </message> @@ -4385,101 +4418,125 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="14"/> <source>Form</source> <translation>폼</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> - <source>TextLabel</source> - <translation>텍스트라벨</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="58"/> <source>Ser&ver Address</source> <translation>서버 주소(&V)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="74"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="156"/> <source>Error Label</source> <translation>오류 라벨</translation> </message> </context> <context> - <name>OwncloudWizardResultPage</name> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>폼</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>텍스트라벨</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> - <source>Your entire account is synced to the local folder </source> - <translation>모든 계정이 로컬 폴더로 동기화됨 </translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> -</context> -<context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>미래에</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="452"/> <source>%n day(s) ago</source> <translation><numerusform>%n 일 전</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>%n hour(s) ago</source> <translation><numerusform>%n 시간 전</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>지금</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="467"/> <source>Less than a minute ago</source> <translation>1분 미만</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="470"/> <source>%n minute(s) ago</source> <translation><numerusform>%n 분 전</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>몇 초 전</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> </message> </context> <context> + <name>SyncFileItem::Status</name> + <message> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> + <source>Undefined</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> + <source>Fatal Error</source> + <translation>치명적 오류</translation> + </message> + <message> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> + <source>Error</source> + <translation>오류</translation> + </message> + <message> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> + <source>Info</source> + <translation>정보</translation> + </message> + <message> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> + <source>Success</source> + <translation>성공</translation> + </message> + <message> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> + <source>Conflict</source> + <translation>충돌</translation> + </message> + <message> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> + <source>Error Ignored</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> + <source>Restored</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> + <source>Blacklisted</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> + <source>Excluded</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>Utility</name> <message> <location filename="../src/common/utility.cpp" line="131"/> @@ -4502,37 +4559,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n year(s)</source> <translation><numerusform>%n년</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n month(s)</source> <translation><numerusform>%n개월</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n day(s)</source> <translation><numerusform>%n일</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n hour(s)</source> <translation><numerusform>%n시간</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="326"/> <source>%n minute(s)</source> <translation><numerusform>%n분</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="327"/> <source>%n second(s)</source> <translation><numerusform>%n초</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%2 %1 중</translation> </message> @@ -4553,15 +4610,15 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> + <location filename="../src/libsync/theme.cpp" line="437"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4569,7 +4626,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="432"/> <source>%1 %2</source> <translation>%2 %1 중</translation> </message> @@ -4677,52 +4734,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>상태가 정의되지 않음</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>동기화 시작 대기 중</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>동기화 진행 중</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>동기화 성공</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>동기화 성공, 일부 파일은 무시되었습니다.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>동기화 오류</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>설치 오류</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>동기화 준비 중</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>중단 중...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>동기화가 일시 정지됨</translation> </message> |