Fix(l10n): 🔠 Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
This commit is contained in:
Nextcloud bot 2023-01-30 10:24:32 +00:00
parent a7013c51e6
commit 2a64fc782b
No known key found for this signature in database
GPG key ID: 130DAB86D3FB356C
55 changed files with 10275 additions and 316 deletions

View file

@ -1045,6 +1045,156 @@ This action will abort any currently running synchronization.</source>
<translation> Възстановяването е неуспешно: % 1</translation> <translation> Възстановяването е неуспешно: % 1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3387,6 +3537,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Конфликт: Изтеглена е версия на сървъра, а локалното копие е преименувано и не е качено.</translation> <translation>Конфликт: Изтеглена е версия на сървъра, а локалното копие е преименувано и не е качено.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3428,7 +3583,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Не може да се синхронизира поради невалиден час на модификация</translation> <translation>Не може да се синхронизира поради невалиден час на модификация</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation>Грешка при изтриване на запис на файл %1 от базата данни</translation> <translation>Грешка при изтриване на запис на файл %1 от базата данни</translation>
</message> </message>
@ -3486,7 +3641,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation>не можа да изтрие файл %1 от локалната БД /база данни/</translation> <translation>не можа да изтрие файл %1 от локалната БД /база данни/</translation>
</message> </message>
@ -3526,7 +3681,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation>Не можа да се изтрие запис на файл %1 от локалната БД</translation> <translation>Не можа да се изтрие запис на файл %1 от локалната БД</translation>
</message> </message>
@ -3577,6 +3732,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Файл %1 има невалиден час на промяна, отчетен от сървъра. Не го записвайте.</translation> <translation>Файл %1 има невалиден час на промяна, отчетен от сървъра. Не го записвайте.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3613,6 +3773,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Внимание, възможен сблъсък с чувствителността към големи и малки букви с% 1 </translation> <translation>Внимание, възможен сблъсък с чувствителността към големи и малки букви с% 1 </translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3649,6 +3814,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation> Файл % 1 не може да бъде преименуван на %2 поради сблъсък с името на локален файл!</translation> <translation> Файл % 1 не може да бъде преименуван на %2 поради сблъсък с името на локален файл!</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4500,7 +4670,7 @@ Server replied with error: %2</source>
<translation>Невъзможност да се актуализират метаданните на файла: % 1</translation> <translation>Невъзможност да се актуализират метаданните на файла: % 1</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>Не може да се зададе запис на файл в локалната БД: %1</translation> <translation>Не може да се зададе запис на файл в локалната БД: %1</translation>
</message> </message>
@ -4732,6 +4902,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Нов опит на всички качвания</translation> <translation>Нов опит на всички качвания</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5917,6 +6093,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Изтеглена е версия на сървъра, копирана е, променен локален файл в конфликтен файл</translation> <translation>Изтеглена е версия на сървъра, копирана е, променен локален файл в конфликтен файл</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1040,6 +1040,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3363,6 +3513,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3404,7 +3559,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3462,7 +3617,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3502,7 +3657,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3553,6 +3708,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3589,6 +3749,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Diwallit, stourmoù a vo marteze gant %1</translation> <translation>Diwallit, stourmoù a vo marteze gant %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3625,6 +3790,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4474,7 +4644,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4706,6 +4876,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Klask en dro pep pellkasadenn</translation> <translation>Klask en dro pep pellkasadenn</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5891,6 +6067,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Stumm servijour pellkarget, eilet eo bet ar restroù cheñchet er restr stourm</translation> <translation>Stumm servijour pellkarget, eilet eo bet ar restroù cheñchet er restr stourm</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1044,6 +1044,156 @@ Aquesta acció anul·larà qualsevol sincronització en execució.</translation>
<translation>S&apos;ha produït un error en la restauració: %1</translation> <translation>S&apos;ha produït un error en la restauració: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3363,6 +3513,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Conflicte: s&apos;ha baixat la versió del servidor, s&apos;ha canviat el nom de la còpia local i no s&apos;ha pujat.</translation> <translation>Conflicte: s&apos;ha baixat la versió del servidor, s&apos;ha canviat el nom de la còpia local i no s&apos;ha pujat.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3404,7 +3559,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3462,7 +3617,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3502,7 +3657,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3553,6 +3708,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3589,6 +3749,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Atenció, possible conflicte entre majúscules i minúscules amb %1</translation> <translation>Atenció, possible conflicte entre majúscules i minúscules amb %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3625,6 +3790,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4474,7 +4644,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4706,6 +4876,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Torna a intentar totes les pujades</translation> <translation>Torna a intentar totes les pujades</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5891,6 +6067,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>S&apos;ha baixat la versió del servidor i s&apos;ha copiat el fitxer local modificat en un fitxer en conflicte</translation> <translation>S&apos;ha baixat la versió del servidor i s&apos;ha copiat el fitxer local modificat en un fitxer en conflicte</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -442,7 +442,7 @@
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="247"/> <location filename="../src/gui/accountsettings.cpp" line="247"/>
<source>Disable encryption</source> <source>Disable encryption</source>
<translation type="unfinished"/> <translation>Vypnout šifrování</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="245"/> <location filename="../src/gui/accountsettings.cpp" line="245"/>
@ -634,17 +634,17 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1036"/> <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>Disable end-to-end encryption</source> <source>Disable end-to-end encryption</source>
<translation type="unfinished"/> <translation>Vypnout šifrování mezi koncovými body</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1037"/> <location filename="../src/gui/accountsettings.cpp" line="1037"/>
<source>Disable end-to-end encryption for %1?</source> <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/> <translation>Vypnout šifrování mezi koncovými body pro %1?</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1038"/> <location filename="../src/gui/accountsettings.cpp" line="1038"/>
<source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source> <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source>
<translation type="unfinished"/> <translation>Odebrání šifrování mezi koncovými body odebere lokálně synchronizované soubory, které jsou šifrované.&lt;br&gt;Zašifrované soubory zůstanou na serveru.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1045"/> <location filename="../src/gui/accountsettings.cpp" line="1045"/>
@ -1045,6 +1045,156 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr
<translation>Obnovení se nezdařilo: %1</translation> <translation>Obnovení se nezdařilo: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -1867,7 +2017,7 @@ Pokud to byla pouze chyba a chcete si tyto soubory ponechat, budou ze serveru zn
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="166"/> <location filename="../src/gui/folderstatusmodel.cpp" line="166"/>
<source>Could not decrypt!</source> <source>Could not decrypt!</source>
<translation type="unfinished"/> <translation>Nepodařilo se rozšifrovat!</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="162"/> <location filename="../src/gui/folderstatusmodel.cpp" line="162"/>
@ -2612,7 +2762,7 @@ Položky u kterých je umožněno mazání budou smazány, pokud brání tomu, a
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
<source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source> <source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/> <translation>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
@ -3386,6 +3536,11 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Konflikt: Stažena verze ze serveru, místní kopie přejmenována a nenahrána.</translation> <translation>Konflikt: Stažena verze ze serveru, místní kopie přejmenována a nenahrána.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3427,7 +3582,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<translation>Není možné provést synchronizaci z důvodu neplatného času změny</translation> <translation>Není možné provést synchronizaci z důvodu neplatného času změny</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation>Chyba při mazání záznamu o souboru %1 z databáze</translation> <translation>Chyba při mazání záznamu o souboru %1 z databáze</translation>
</message> </message>
@ -3485,7 +3640,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation>nepodařilo se smazat soubor %1 lokální databáze</translation> <translation>nepodařilo se smazat soubor %1 lokální databáze</translation>
</message> </message>
@ -3525,7 +3680,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation>Nepodařilo se smazat záznam o souboru %1 z lokální databáze</translation> <translation>Nepodařilo se smazat záznam o souboru %1 z lokální databáze</translation>
</message> </message>
@ -3576,6 +3731,11 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Soubor %1 nemá platný čas změny, hlášený na server. Neukládat ho.</translation> <translation>Soubor %1 nemá platný čas změny, hlášený na server. Neukládat ho.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3612,6 +3772,11 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Pozor, možná kolize s %1 z důvodu rozlišování malých/VELKÝCH písmen</translation> <translation>Pozor, možná kolize s %1 z důvodu rozlišování malých/VELKÝCH písmen</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3648,6 +3813,11 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>Soubor %1 nemohl být přejmenován na %2 z důvodu kolize názvu s místním souborem</translation> <translation>Soubor %1 nemohl být přejmenován na %2 z důvodu kolize názvu s místním souborem</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4499,7 +4669,7 @@ Server odpověděl chybou: %2</translation>
<translation>Nedaří se aktualizovat metadata souboru: %1</translation> <translation>Nedaří se aktualizovat metadata souboru: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>Nepodařilo se nastavit záznam ohledně souboru na lokální databázi: %1</translation> <translation>Nepodařilo se nastavit záznam ohledně souboru na lokální databázi: %1</translation>
</message> </message>
@ -4731,6 +4901,12 @@ Server odpověděl chybou: %2</translation>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Znovu spustit všechna nahrávání</translation> <translation>Znovu spustit všechna nahrávání</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5916,6 +6092,11 @@ Server odpověděl chybou: %2</translation>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Stažena verze ze serveru, změněný místní soubor zkopírován do konfliktního souboru</translation> <translation>Stažena verze ze serveru, změněný místní soubor zkopírován do konfliktního souboru</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1044,6 +1044,156 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3368,6 +3518,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3409,7 +3564,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3467,7 +3622,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3507,7 +3662,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3558,6 +3713,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3594,6 +3754,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Advarsel, mulig stort/lille bogstavskonflikt med %1</translation> <translation>Advarsel, mulig stort/lille bogstavskonflikt med %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3630,6 +3795,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4479,7 +4649,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4711,6 +4881,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Prøv alle uploads igen</translation> <translation>Prøv alle uploads igen</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5896,6 +6072,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Versionen serveren hentet, kopierede den ændrede lokale fil til filen med konflikt</translation> <translation>Versionen serveren hentet, kopierede den ændrede lokale fil til filen med konflikt</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -442,7 +442,7 @@
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="247"/> <location filename="../src/gui/accountsettings.cpp" line="247"/>
<source>Disable encryption</source> <source>Disable encryption</source>
<translation type="unfinished"/> <translation>Verschlüsselung deaktivieren</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="245"/> <location filename="../src/gui/accountsettings.cpp" line="245"/>
@ -633,17 +633,17 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1036"/> <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>Disable end-to-end encryption</source> <source>Disable end-to-end encryption</source>
<translation type="unfinished"/> <translation>Ende-zu-Ende-Verschlüsselung deaktivieren</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1037"/> <location filename="../src/gui/accountsettings.cpp" line="1037"/>
<source>Disable end-to-end encryption for %1?</source> <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/> <translation>Ende-zu-Ende-Verschlüsselung für %1 deaktivieren?</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1038"/> <location filename="../src/gui/accountsettings.cpp" line="1038"/>
<source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source> <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source>
<translation type="unfinished"/> <translation>Durch das Entfernen der Ende-zu-Ende-Verschlüsselung werden lokal synchronisierte Dateien entfernt, die verschlüsselt sind.&lt;br&gt;Verschlüsselte Dateien verbleiben auf dem Server.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1045"/> <location filename="../src/gui/accountsettings.cpp" line="1045"/>
@ -1044,6 +1044,156 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation>
<translation>Wiederherstellung fehlgeschlagen: %1</translation> <translation>Wiederherstellung fehlgeschlagen: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -1867,7 +2017,7 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="166"/> <location filename="../src/gui/folderstatusmodel.cpp" line="166"/>
<source>Could not decrypt!</source> <source>Could not decrypt!</source>
<translation type="unfinished"/> <translation>Konnte nicht entschlüsseln!</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="162"/> <location filename="../src/gui/folderstatusmodel.cpp" line="162"/>
@ -2612,7 +2762,7 @@ Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn diese das Lösch
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
<source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source> <source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/> <translation>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
@ -3386,6 +3536,11 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Konflikt: Serverversion heruntergeladen, lokale Kopie umbenannt und nicht hochgeladen.</translation> <translation>Konflikt: Serverversion heruntergeladen, lokale Kopie umbenannt und nicht hochgeladen.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3427,7 +3582,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Synchronisierung wegen ungültiger Änderungszeit nicht möglich</translation> <translation>Synchronisierung wegen ungültiger Änderungszeit nicht möglich</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation>Fehler beim Löschen des Dateisatzes %1 aus der Datenbank</translation> <translation>Fehler beim Löschen des Dateisatzes %1 aus der Datenbank</translation>
</message> </message>
@ -3485,7 +3640,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation>Datei %1 konnte nicht aus lokaler Datenbank gelöscht werden</translation> <translation>Datei %1 konnte nicht aus lokaler Datenbank gelöscht werden</translation>
</message> </message>
@ -3525,7 +3680,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation>Der Dateidatensatz %1 konnte nicht aus der lokalen Datenbank gelöscht werden</translation> <translation>Der Dateidatensatz %1 konnte nicht aus der lokalen Datenbank gelöscht werden</translation>
</message> </message>
@ -3576,6 +3731,11 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Datei %1 hat eine ungültige Änderungszeit, die vom Server gemeldet wurde. Speichern Sie sie nicht.</translation> <translation>Datei %1 hat eine ungültige Änderungszeit, die vom Server gemeldet wurde. Speichern Sie sie nicht.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3612,6 +3772,11 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Achtung, es könnte ein Problem mit der Groß-/Kleinschreibung für %1 auftreten</translation> <translation>Achtung, es könnte ein Problem mit der Groß-/Kleinschreibung für %1 auftreten</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3648,6 +3813,11 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>Die Datei %1 kann aufgrund eines Konfliktes mit einem lokalen Dateinamen nicht in %2 umbenannt werden</translation> <translation>Die Datei %1 kann aufgrund eines Konfliktes mit einem lokalen Dateinamen nicht in %2 umbenannt werden</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4499,7 +4669,7 @@ Server antwortete mit folgendem Fehler: %2</translation>
<translation>Die Metadaten der Datei konnten nicht aktualisiert werden: %1</translation> <translation>Die Metadaten der Datei konnten nicht aktualisiert werden: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>Dateidatensatz konnte nicht auf lokale DB gesetzt werden: %1</translation> <translation>Dateidatensatz konnte nicht auf lokale DB gesetzt werden: %1</translation>
</message> </message>
@ -4731,6 +4901,12 @@ Server antwortete mit folgendem Fehler: %2</translation>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Alle Uploads neu starten</translation> <translation>Alle Uploads neu starten</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5916,6 +6092,11 @@ Server antwortete mit folgendem Fehler: %2</translation>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Serverversion heruntergeladen. Die bearbeitete lokale Datei wurde in eine Konfliktdatei kopiert.</translation> <translation>Serverversion heruntergeladen. Die bearbeitete lokale Datei wurde in eine Konfliktdatei kopiert.</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -442,7 +442,7 @@
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="247"/> <location filename="../src/gui/accountsettings.cpp" line="247"/>
<source>Disable encryption</source> <source>Disable encryption</source>
<translation type="unfinished"/> <translation>Απενεργοποίηση κρυπτογράφησης</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="245"/> <location filename="../src/gui/accountsettings.cpp" line="245"/>
@ -629,7 +629,7 @@ This action will abort any currently running synchronization.</source>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1036"/> <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>Disable end-to-end encryption</source> <source>Disable end-to-end encryption</source>
<translation type="unfinished"/> <translation>Απενεργοποίηση κρυπτογράφησης από άκρο σε άκρο</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1037"/> <location filename="../src/gui/accountsettings.cpp" line="1037"/>
@ -1040,6 +1040,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3371,6 +3521,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Διένεξη: Λήψη έκδοσης διακομιστή, μετονομασία τοπικού αντιγράφου και μη μεταφόρτωση.</translation> <translation>Διένεξη: Λήψη έκδοσης διακομιστή, μετονομασία τοπικού αντιγράφου και μη μεταφόρτωση.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3412,7 +3567,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3470,7 +3625,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3510,7 +3665,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3561,6 +3716,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3597,6 +3757,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Προσοχή, πιθανή διένεξη κεφαλαίων-πεζών γραμμάτων με το %1</translation> <translation>Προσοχή, πιθανή διένεξη κεφαλαίων-πεζών γραμμάτων με το %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3633,6 +3798,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -3760,7 +3930,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message> <message>
<location filename="../src/libsync/propagateupload.cpp" line="235"/> <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source> <source>Failed to upload encrypted file.</source>
<translation type="unfinished"/> <translation>Η μεταμόρφωση του κρυπτογραφημένου αρχείου απέτυχε.</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/propagateupload.cpp" line="266"/> <location filename="../src/libsync/propagateupload.cpp" line="266"/>
@ -4482,7 +4652,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4714,6 +4884,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Επανάληψη όλων των μεταφορτώσεων</translation> <translation>Επανάληψη όλων των μεταφορτώσεων</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5899,6 +6075,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Η έκδοση του διακομιστή κατέβηκε, η αντιγραφή άλλαξε το τοπικό αρχείο σε συγκρουόμενο αρχείο </translation> <translation>Η έκδοση του διακομιστή κατέβηκε, η αντιγραφή άλλαξε το τοπικό αρχείο σε συγκρουόμενο αρχείο </translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -442,7 +442,7 @@
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="247"/> <location filename="../src/gui/accountsettings.cpp" line="247"/>
<source>Disable encryption</source> <source>Disable encryption</source>
<translation type="unfinished"/> <translation>Disable encryption</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="245"/> <location filename="../src/gui/accountsettings.cpp" line="245"/>
@ -634,17 +634,17 @@ This action will abort any currently running synchronization.</translation>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1036"/> <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>Disable end-to-end encryption</source> <source>Disable end-to-end encryption</source>
<translation type="unfinished"/> <translation>Disable end-to-end encryption</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1037"/> <location filename="../src/gui/accountsettings.cpp" line="1037"/>
<source>Disable end-to-end encryption for %1?</source> <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/> <translation>Disable end-to-end encryption for %1?</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1038"/> <location filename="../src/gui/accountsettings.cpp" line="1038"/>
<source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source> <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source>
<translation type="unfinished"/> <translation>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1045"/> <location filename="../src/gui/accountsettings.cpp" line="1045"/>
@ -1045,6 +1045,156 @@ This action will abort any currently running synchronization.</translation>
<translation>Restoration failed: %1</translation> <translation>Restoration failed: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -1868,7 +2018,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="166"/> <location filename="../src/gui/folderstatusmodel.cpp" line="166"/>
<source>Could not decrypt!</source> <source>Could not decrypt!</source>
<translation type="unfinished"/> <translation>Could not decrypt!</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="162"/> <location filename="../src/gui/folderstatusmodel.cpp" line="162"/>
@ -2613,7 +2763,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
<source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source> <source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/> <translation>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
@ -3387,6 +3537,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Conflict: Server version downloaded, local copy renamed and not uploaded.</translation> <translation>Conflict: Server version downloaded, local copy renamed and not uploaded.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3428,7 +3583,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Cannot sync due to invalid modification time</translation> <translation>Cannot sync due to invalid modification time</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation>Error while deleting file record %1 from the database</translation> <translation>Error while deleting file record %1 from the database</translation>
</message> </message>
@ -3486,7 +3641,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation>could not delete file %1 from local DB</translation> <translation>could not delete file %1 from local DB</translation>
</message> </message>
@ -3526,7 +3681,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation>Could not delete file record %1 from local DB</translation> <translation>Could not delete file record %1 from local DB</translation>
</message> </message>
@ -3577,6 +3732,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>File %1 has invalid modified time reported by server. Do not save it.</translation> <translation>File %1 has invalid modified time reported by server. Do not save it.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3613,6 +3773,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Attention, possible case sensitivity clash with %1</translation> <translation>Attention, possible case sensitivity clash with %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3649,6 +3814,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>File %1 cannot be renamed to %2 because of a local file name clash</translation> <translation>File %1 cannot be renamed to %2 because of a local file name clash</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4500,7 +4670,7 @@ Server replied with error: %2</translation>
<translation>Could not update file metadata: %1</translation> <translation>Could not update file metadata: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>Could not set file record to local DB: %1</translation> <translation>Could not set file record to local DB: %1</translation>
</message> </message>
@ -4732,6 +4902,12 @@ Server replied with error: %2</translation>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Retry all uploads</translation> <translation>Retry all uploads</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5917,6 +6093,11 @@ Server replied with error: %2</translation>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Server version downloaded, copied changed local file into conflict file</translation> <translation>Server version downloaded, copied changed local file into conflict file</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation>Restaŭrado malsukcesis: %1</translation> <translation>Restaŭrado malsukcesis: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3362,6 +3512,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3403,7 +3558,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3461,7 +3616,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3501,7 +3656,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3552,6 +3707,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3588,6 +3748,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Atentu: ebla usklecodistinga konflikto kun %1</translation> <translation>Atentu: ebla usklecodistinga konflikto kun %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3624,6 +3789,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4472,7 +4642,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4704,6 +4874,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Reprovi ĉiujn alŝutojn</translation> <translation>Reprovi ĉiujn alŝutojn</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5889,6 +6065,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Servila versio elŝutita; la ŝanĝita loka dosiero estis kopiita en konfliktan dosieron</translation> <translation>Servila versio elŝutita; la ŝanĝita loka dosiero estis kopiita en konfliktan dosieron</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -31,7 +31,7 @@
<message> <message>
<location filename="../src/gui/tray/ActivityItemContent.qml" line="204"/> <location filename="../src/gui/tray/ActivityItemContent.qml" line="204"/>
<source>Open file details</source> <source>Open file details</source>
<translation>Abrir detalles de archivo</translation> <translation>Abrir detalles del archivo</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/tray/ActivityItemContent.qml" line="208"/> <location filename="../src/gui/tray/ActivityItemContent.qml" line="208"/>
@ -172,7 +172,7 @@
<message> <message>
<location filename="../src/gui/tray/EditFileLocallyLoadingDialog.qml" line="75"/> <location filename="../src/gui/tray/EditFileLocallyLoadingDialog.qml" line="75"/>
<source>Opening file for local editing</source> <source>Opening file for local editing</source>
<translation>Abriendo archivo para edición local</translation> <translation>Abriendo archivo para editarlo en local</translation>
</message> </message>
</context> </context>
<context> <context>
@ -412,7 +412,7 @@
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="93"/> <location filename="../src/gui/accountsettings.cpp" line="93"/>
<source>End-to-end Encryption with Virtual Files</source> <source>End-to-end Encryption with Virtual Files</source>
<translation>Cifrado de extremo a extremo con Archivos virtuales</translation> <translation>Cifrado de extremo a extremo con Archivos Virtuales</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="94"/> <location filename="../src/gui/accountsettings.cpp" line="94"/>
@ -442,7 +442,7 @@
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="247"/> <location filename="../src/gui/accountsettings.cpp" line="247"/>
<source>Disable encryption</source> <source>Disable encryption</source>
<translation type="unfinished"/> <translation>Deshabilitar cifrado</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="245"/> <location filename="../src/gui/accountsettings.cpp" line="245"/>
@ -634,17 +634,17 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1036"/> <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>Disable end-to-end encryption</source> <source>Disable end-to-end encryption</source>
<translation type="unfinished"/> <translation>Deshabilitar cifrado de extremo a extremo</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1037"/> <location filename="../src/gui/accountsettings.cpp" line="1037"/>
<source>Disable end-to-end encryption for %1?</source> <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/> <translation>Deshabilitar cifrado de extremo a extremo para %1?</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1038"/> <location filename="../src/gui/accountsettings.cpp" line="1038"/>
<source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source> <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source>
<translation type="unfinished"/> <translation>Quitar el cifrado de extremo a extremo borrará los archivos sincronizados localmente que se encuentran encriptados.&lt;br&gt;Los archivos encriptados se mantendrán en el servidor.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1045"/> <location filename="../src/gui/accountsettings.cpp" line="1045"/>
@ -1045,6 +1045,156 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla
<translation>Fallo al restaurar: %1</translation> <translation>Fallo al restaurar: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -1869,7 +2019,7 @@ Si esto ha sido un accidente, y decides mantener tus archivos, serán re-sincron
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="166"/> <location filename="../src/gui/folderstatusmodel.cpp" line="166"/>
<source>Could not decrypt!</source> <source>Could not decrypt!</source>
<translation type="unfinished"/> <translation>¡No fue posible desencriptar!</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="162"/> <location filename="../src/gui/folderstatusmodel.cpp" line="162"/>
@ -2614,7 +2764,7 @@ Los elementos que se permite su borrado se eliminarán si impiden que un directo
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
<source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source> <source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/> <translation>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
@ -3388,6 +3538,11 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Conflicto: Versión del servidor descargada, la copia local ha sido renombrada pero no se ha podido subir.</translation> <translation>Conflicto: Versión del servidor descargada, la copia local ha sido renombrada pero no se ha podido subir.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3429,7 +3584,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<translation>No se puede sincronizar debido a una hora de modificación no válida</translation> <translation>No se puede sincronizar debido a una hora de modificación no válida</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation>Error mientras se borraba el registro de archivo %1 de la base de datos</translation> <translation>Error mientras se borraba el registro de archivo %1 de la base de datos</translation>
</message> </message>
@ -3487,7 +3642,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation>no fue posible borrar el archivo %1 de la base de datos local</translation> <translation>no fue posible borrar el archivo %1 de la base de datos local</translation>
</message> </message>
@ -3527,7 +3682,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation>No fue posible borrar el registro del archivo %1 de la base de datos local</translation> <translation>No fue posible borrar el registro del archivo %1 de la base de datos local</translation>
</message> </message>
@ -3578,6 +3733,11 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>El servidor informa que el archivo %1 tiene una hora de modificación no válida. No lo guardes.</translation> <translation>El servidor informa que el archivo %1 tiene una hora de modificación no válida. No lo guardes.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3614,6 +3774,11 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Atención, posible error de mayúsculas/minúsculas en %1</translation> <translation>Atención, posible error de mayúsculas/minúsculas en %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3650,6 +3815,11 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>El archivo %1 no se pudo renombrar a %2 a causa de un conflicto con el nombre de un archivo local</translation> <translation>El archivo %1 no se pudo renombrar a %2 a causa de un conflicto con el nombre de un archivo local</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4501,7 +4671,7 @@ El servidor respondió con el error: %2</translation>
<translation>No se pudo actualizar los metadatos del archivo: %1</translation> <translation>No se pudo actualizar los metadatos del archivo: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>No fue posible establecer el registro del archivo a la base de datos local: %1</translation> <translation>No fue posible establecer el registro del archivo a la base de datos local: %1</translation>
</message> </message>
@ -4733,6 +4903,12 @@ El servidor respondió con el error: %2</translation>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Reintentar todas las subidas</translation> <translation>Reintentar todas las subidas</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5918,6 +6094,11 @@ El servidor respondió con el error: %2</translation>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Versión del servidor descargada, se ha copiado el fichero local cambiado al fichero en conflicto</translation> <translation>Versión del servidor descargada, se ha copiado el fichero local cambiado al fichero en conflicto</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation> <translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4465,7 +4635,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4697,6 +4867,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5882,6 +6058,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation> <translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation> <translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4465,7 +4635,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4697,6 +4867,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5882,6 +6058,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation> <translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation> <translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4465,7 +4635,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4697,6 +4867,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5882,6 +6058,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation> <translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation> <translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4465,7 +4635,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4697,6 +4867,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5882,6 +6058,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation> <translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation> <translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4465,7 +4635,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4697,6 +4867,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5882,6 +6058,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation> <translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation> <translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4465,7 +4635,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4697,6 +4867,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5882,6 +6058,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation> <translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation> <translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4465,7 +4635,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4697,6 +4867,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5882,6 +6058,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation> <translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation> <translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4465,7 +4635,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4697,6 +4867,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5882,6 +6058,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation> <translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation> <translation>Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4465,7 +4635,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4697,6 +4867,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5882,6 +6058,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation> <translation>Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3352,6 +3502,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3393,7 +3548,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3451,7 +3606,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3491,7 +3646,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3542,6 +3697,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3578,6 +3738,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Tähelepanu, võimalik tõusutundliku nime konflikt %1-ga</translation> <translation>Tähelepanu, võimalik tõusutundliku nime konflikt %1-ga</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3614,6 +3779,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4463,7 +4633,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4695,6 +4865,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5880,6 +6056,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1045,6 +1045,156 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation>
<translation>Berrezartzeak huts egin du: %1</translation> <translation>Berrezartzeak huts egin du: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3387,6 +3537,11 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Gatazka: zerbitzari bertsioa deskargatu da, kopia lokala berrizendatua eta ez kargatuta.</translation> <translation>Gatazka: zerbitzari bertsioa deskargatu da, kopia lokala berrizendatua eta ez kargatuta.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3428,7 +3583,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Ezin da sinkronizatu aldaketa-ordu baliogabea delako</translation> <translation>Ezin da sinkronizatu aldaketa-ordu baliogabea delako</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation>Errorea %1 fitxategi erregistroa datu-basetik ezabatzean</translation> <translation>Errorea %1 fitxategi erregistroa datu-basetik ezabatzean</translation>
</message> </message>
@ -3486,7 +3641,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation>Ezin izan da %1 fitxategia datu-base lokaletik ezabatu</translation> <translation>Ezin izan da %1 fitxategia datu-base lokaletik ezabatu</translation>
</message> </message>
@ -3526,7 +3681,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation>Ezin izan da %1 fitxategiaren erregistroa datu-base lokaletik ezabatu</translation> <translation>Ezin izan da %1 fitxategiaren erregistroa datu-base lokaletik ezabatu</translation>
</message> </message>
@ -3577,6 +3732,11 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>% 1 fitxategiak zerbitzariak jakinarazitako aldaketa-ordu baliogabea du. Ez gorde.</translation> <translation>% 1 fitxategiak zerbitzariak jakinarazitako aldaketa-ordu baliogabea du. Ez gorde.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3613,6 +3773,11 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Kontuz, baliteke maiuskulekin izen gatazka egotea %1ekin</translation> <translation>Kontuz, baliteke maiuskulekin izen gatazka egotea %1ekin</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3649,6 +3814,11 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>%1 fitxategiari ezin zaio %2 izena eman fitxategi lokal baten izenarekin talkagatik.</translation> <translation>%1 fitxategiari ezin zaio %2 izena eman fitxategi lokal baten izenarekin talkagatik.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4500,7 +4670,7 @@ Zerbitzariak errorearekin erantzun du: %2</translation>
<translation>Ezin izan dira fitxategiaren metadatuak eguneratu: %1</translation> <translation>Ezin izan dira fitxategiaren metadatuak eguneratu: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>Ezin izan da fitxategiaren erregistroa datu-base lokalean ezarri: %1</translation> <translation>Ezin izan da fitxategiaren erregistroa datu-base lokalean ezarri: %1</translation>
</message> </message>
@ -4732,6 +4902,12 @@ Zerbitzariak errorearekin erantzun du: %2</translation>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Saiatu dena berriro kargatzen</translation> <translation>Saiatu dena berriro kargatzen</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5917,6 +6093,11 @@ Zerbitzariak errorearekin erantzun du: %2</translation>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Zerbitzari bertsioa deskargatu da, kopiaturikoak fitxategi lokala fitxategi gatazkatsu bihurtu du</translation> <translation>Zerbitzari bertsioa deskargatu da, kopiaturikoak fitxategi lokala fitxategi gatazkatsu bihurtu du</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4464,7 +4634,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4696,6 +4866,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5881,6 +6057,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>نسخه سرور دانلود شد، پرونده محلی تغییر یافته به پرونده ناسازگار کپی شد</translation> <translation>نسخه سرور دانلود شد، پرونده محلی تغییر یافته به پرونده ناسازگار کپی شد</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -31,7 +31,7 @@
<message> <message>
<location filename="../src/gui/tray/ActivityItemContent.qml" line="204"/> <location filename="../src/gui/tray/ActivityItemContent.qml" line="204"/>
<source>Open file details</source> <source>Open file details</source>
<translation type="unfinished"/> <translation>Avaa tiedoston yksityiskohdat</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/tray/ActivityItemContent.qml" line="208"/> <location filename="../src/gui/tray/ActivityItemContent.qml" line="208"/>
@ -172,7 +172,7 @@
<message> <message>
<location filename="../src/gui/tray/EditFileLocallyLoadingDialog.qml" line="75"/> <location filename="../src/gui/tray/EditFileLocallyLoadingDialog.qml" line="75"/>
<source>Opening file for local editing</source> <source>Opening file for local editing</source>
<translation type="unfinished"/> <translation>Avataan tiedosto paikallista muokkausta varten</translation>
</message> </message>
</context> </context>
<context> <context>
@ -196,7 +196,7 @@
<message> <message>
<location filename="../src/gui/filedetails/FileDetailsPage.qml" line="128"/> <location filename="../src/gui/filedetails/FileDetailsPage.qml" line="128"/>
<source>Dismiss</source> <source>Dismiss</source>
<translation type="unfinished"/> <translation>Hylkää</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/filedetails/FileDetailsPage.qml" line="172"/> <location filename="../src/gui/filedetails/FileDetailsPage.qml" line="172"/>
@ -206,7 +206,7 @@
<message> <message>
<location filename="../src/gui/filedetails/FileDetailsPage.qml" line="179"/> <location filename="../src/gui/filedetails/FileDetailsPage.qml" line="179"/>
<source>Sharing</source> <source>Sharing</source>
<translation type="unfinished"/> <translation>Jakaminen</translation>
</message> </message>
</context> </context>
<context> <context>
@ -442,7 +442,7 @@
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="247"/> <location filename="../src/gui/accountsettings.cpp" line="247"/>
<source>Disable encryption</source> <source>Disable encryption</source>
<translation type="unfinished"/> <translation>Poista salaus käytöstä</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="245"/> <location filename="../src/gui/accountsettings.cpp" line="245"/>
@ -457,7 +457,7 @@
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="258"/> <location filename="../src/gui/accountsettings.cpp" line="258"/>
<source>End-to-end encryption has been enabled for this account</source> <source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/> <translation>Päästä päähän -salaus on käytössä tällä tilillä</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="279"/> <location filename="../src/gui/accountsettings.cpp" line="279"/>
@ -632,7 +632,7 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1036"/> <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>Disable end-to-end encryption</source> <source>Disable end-to-end encryption</source>
<translation type="unfinished"/> <translation>Poista päästä päähän -salaus käytöstä</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1037"/> <location filename="../src/gui/accountsettings.cpp" line="1037"/>
@ -768,7 +768,7 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1591"/> <location filename="../src/gui/accountsettings.cpp" line="1591"/>
<source>Set up encryption</source> <source>Set up encryption</source>
<translation type="unfinished"/> <translation>Aseta salaus</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1596"/> <location filename="../src/gui/accountsettings.cpp" line="1596"/>
@ -1043,6 +1043,156 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
<translation>Palautus epäonnistui: %1</translation> <translation>Palautus epäonnistui: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -1294,7 +1444,7 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
<location filename="../src/gui/editlocallyjob.cpp" line="129"/> <location filename="../src/gui/editlocallyjob.cpp" line="129"/>
<location filename="../src/gui/editlocallyjob.cpp" line="551"/> <location filename="../src/gui/editlocallyjob.cpp" line="551"/>
<source>Please try again.</source> <source>Please try again.</source>
<translation type="unfinished"/> <translation>Yritä uudelleen.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/editlocallyjob.cpp" line="68"/> <location filename="../src/gui/editlocallyjob.cpp" line="68"/>
@ -1339,12 +1489,12 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
<message> <message>
<location filename="../src/gui/editlocallyjob.cpp" line="551"/> <location filename="../src/gui/editlocallyjob.cpp" line="551"/>
<source>Could not open %1</source> <source>Could not open %1</source>
<translation type="unfinished"/> <translation>Ei voitu avata %1</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/editlocallyjob.cpp" line="613"/> <location filename="../src/gui/editlocallyjob.cpp" line="613"/>
<source>File %1 already locked.</source> <source>File %1 already locked.</source>
<translation type="unfinished"/> <translation>Tiedosto %1 on jo lukittu.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/editlocallyjob.cpp" line="614"/> <location filename="../src/gui/editlocallyjob.cpp" line="614"/>
@ -1360,7 +1510,7 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
<message> <message>
<location filename="../src/gui/editlocallyjob.cpp" line="633"/> <location filename="../src/gui/editlocallyjob.cpp" line="633"/>
<source>File %1 could not be locked.</source> <source>File %1 could not be locked.</source>
<translation type="unfinished"/> <translation>Tiedostoa %1 ei voitu lukita.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3248,7 +3398,7 @@ Note that using any logging command line options will override this setting.</so
<message> <message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished"/> <translation>Peruuta</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="417"/> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="417"/>
@ -3365,6 +3515,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Konflikti: Palvelimen versio ladattu, paikallinen kopio on nimetty uudelleen mutta ei ladattu palvelimelle.</translation> <translation>Konflikti: Palvelimen versio ladattu, paikallinen kopio on nimetty uudelleen mutta ei ladattu palvelimelle.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3406,7 +3561,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ei voida synkronoida virheellisen muokkausajan vuoksi</translation> <translation>Ei voida synkronoida virheellisen muokkausajan vuoksi</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3464,7 +3619,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3504,7 +3659,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3555,6 +3710,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3591,6 +3751,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3627,6 +3792,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -3988,7 +4158,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message> <message>
<location filename="../src/gui/filedetails/sharemodel.cpp" line="541"/> <location filename="../src/gui/filedetails/sharemodel.cpp" line="541"/>
<source>Internal link</source> <source>Internal link</source>
<translation type="unfinished"/> <translation>Sisäinen linkki</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/filedetails/sharemodel.cpp" line="797"/> <location filename="../src/gui/filedetails/sharemodel.cpp" line="797"/>
@ -4179,7 +4349,7 @@ Server replied with error: %2</source>
<message> <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1193"/> <location filename="../src/gui/socketapi/socketapi.cpp" line="1193"/>
<source>Encrypt</source> <source>Encrypt</source>
<translation type="unfinished"/> <translation>Salaa</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/> <location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
@ -4476,7 +4646,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4708,6 +4878,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Yritä uudelleen kaikkia lähetyksiä</translation> <translation>Yritä uudelleen kaikkia lähetyksiä</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5893,6 +6069,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Palvelimen versio ladattu, paikallinen muutettu tiedosto kopioitu konfliktitiedostoksi</translation> <translation>Palvelimen versio ladattu, paikallinen muutettu tiedosto kopioitu konfliktitiedostoksi</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1043,6 +1043,156 @@ Vous prenez vos propres risques.</translation>
<translation>Échec de la restauration : %1</translation> <translation>Échec de la restauration : %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3386,6 +3536,11 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Conflit : La version du serveur a é téléchargée, la version locale renommée et non téléversée.</translation> <translation>Conflit : La version du serveur a é téléchargée, la version locale renommée et non téléversée.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3427,7 +3582,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Impossible de synchroniser à cause d&apos;une date de modification invalide</translation> <translation>Impossible de synchroniser à cause d&apos;une date de modification invalide</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation>Erreur à la suppression de l&apos;enregistrement du fichier %1 de la base de données</translation> <translation>Erreur à la suppression de l&apos;enregistrement du fichier %1 de la base de données</translation>
</message> </message>
@ -3485,7 +3640,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation>Impossible de supprimer le fichier %1 de la base de données locale</translation> <translation>Impossible de supprimer le fichier %1 de la base de données locale</translation>
</message> </message>
@ -3525,7 +3680,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation>Impossible de supprimer l&apos;enregistrement du fichier %1 depuis la base de données locale</translation> <translation>Impossible de supprimer l&apos;enregistrement du fichier %1 depuis la base de données locale</translation>
</message> </message>
@ -3576,6 +3731,11 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Le fichier %1 présente une date de modification invalide sur le serveur. Enregistrement impossible.</translation> <translation>Le fichier %1 présente une date de modification invalide sur le serveur. Enregistrement impossible.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3612,6 +3772,11 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Attention, collision possible avec %1 à cause de la casse</translation> <translation>Attention, collision possible avec %1 à cause de la casse</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3648,6 +3813,11 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>Le fichier %1 ne peut pas être renommé en %2 à cause d&apos;un conflit local de nom de fichier</translation> <translation>Le fichier %1 ne peut pas être renommé en %2 à cause d&apos;un conflit local de nom de fichier</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4499,7 +4669,7 @@ Le serveur a répondu avec l&apos;erreur : %2</translation>
<translation>Impossible de mettre à jour les métadonnées du fichier : %1</translation> <translation>Impossible de mettre à jour les métadonnées du fichier : %1</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>Impossible de définir l&apos;enregistrement du fichier dans la base de données locale : %1</translation> <translation>Impossible de définir l&apos;enregistrement du fichier dans la base de données locale : %1</translation>
</message> </message>
@ -4731,6 +4901,12 @@ Le serveur a répondu avec l&apos;erreur : %2</translation>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Relancer tous les envois</translation> <translation>Relancer tous les envois</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5916,6 +6092,11 @@ Le serveur a répondu avec l&apos;erreur : %2</translation>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>La version du serveur est téléchargée, les changements locaux ont é copiés dans un fichier conflit.</translation> <translation>La version du serveur est téléchargée, les changements locaux ont é copiés dans un fichier conflit.</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1044,6 +1044,156 @@ Esta acción interromperá calquera sincronización que estea a executarse actua
<translation>Produciuse un fallo na restauración: %1</translation> <translation>Produciuse un fallo na restauración: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3381,6 +3531,11 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Conflito: Versión do servidor descargada, a copia local cambiou o nome e non se cargou.</translation> <translation>Conflito: Versión do servidor descargada, a copia local cambiou o nome e non se cargou.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3422,7 +3577,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3480,7 +3635,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3520,7 +3675,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3571,6 +3726,11 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3607,6 +3767,11 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Atención, posíbel colisión entre maiúsculas e minúsculas con %1</translation> <translation>Atención, posíbel colisión entre maiúsculas e minúsculas con %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3643,6 +3808,11 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4492,7 +4662,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4724,6 +4894,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Tentar de novo todos os envíos</translation> <translation>Tentar de novo todos os envíos</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5909,6 +6085,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Versión do servidor descargada, copiouse o cambio local do ficheiro dentro do ficheiro en conflito</translation> <translation>Versión do servidor descargada, copiouse o cambio local do ficheiro dentro do ficheiro en conflito</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1040,6 +1040,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3359,6 +3509,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3400,7 +3555,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3458,7 +3613,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3498,7 +3653,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3549,6 +3704,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3585,6 +3745,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>לתשומת לבך, כנראה שיש סתירה של אותיות רישיות עם %1</translation> <translation>לתשומת לבך, כנראה שיש סתירה של אותיות רישיות עם %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3621,6 +3786,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4470,7 +4640,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4702,6 +4872,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>לנסות את כל ההורדות מחדש</translation> <translation>לנסות את כל ההורדות מחדש</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5887,6 +6063,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>הגרסה מהשרת התקבלה, והקובץ המקומי שהשתנה הועתק לקובץ סתירה</translation> <translation>הגרסה מהשרת התקבלה, והקובץ המקומי שהשתנה הועתק לקובץ סתירה</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1044,6 +1044,156 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju.</translation>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3386,6 +3536,11 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Nepodudaranje: preuzeta inačica poslužitelja, lokalna kopija preimenovana i nije otpremljena.</translation> <translation>Nepodudaranje: preuzeta inačica poslužitelja, lokalna kopija preimenovana i nije otpremljena.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3427,7 +3582,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3485,7 +3640,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3525,7 +3680,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3576,6 +3731,11 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3612,6 +3772,11 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Pažnja, moguće nepodudaranje velikih i malih slova s %1</translation> <translation>Pažnja, moguće nepodudaranje velikih i malih slova s %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3648,6 +3813,11 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>Datoteka %1 ne može se preimenovati u %2 zbog nepodudaranja naziva lokalne datoteke</translation> <translation>Datoteka %1 ne može se preimenovati u %2 zbog nepodudaranja naziva lokalne datoteke</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4497,7 +4667,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4729,6 +4899,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Ponovno pokreni sve otpreme</translation> <translation>Ponovno pokreni sve otpreme</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5914,6 +6090,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Preuzeta je inačica poslužitelja, promijenjena lokalna datoteka kopirana u datoteku nepodudaranja</translation> <translation>Preuzeta je inačica poslužitelja, promijenjena lokalna datoteka kopirana u datoteku nepodudaranja</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1045,6 +1045,156 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást.</translation>
<translation>Helyreállítás sikertelen: %1</translation> <translation>Helyreállítás sikertelen: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3388,6 +3538,11 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Ütközés: A kiszolgáló verziója letöltve, a helyi példány átnevezve és nem lett feltöltve.</translation> <translation>Ütközés: A kiszolgáló verziója letöltve, a helyi példány átnevezve és nem lett feltöltve.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3429,7 +3584,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<translation>Az érvénytelen módosítási idő miatt nem lehet szinkronizálni</translation> <translation>Az érvénytelen módosítási idő miatt nem lehet szinkronizálni</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation>Hiba történt a(z) %1 fájlrekord adatbázisból törlése során</translation> <translation>Hiba történt a(z) %1 fájlrekord adatbázisból törlése során</translation>
</message> </message>
@ -3487,7 +3642,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation>a(z) %1 fájl törlése a helyi adatbázisból nem sikerült</translation> <translation>a(z) %1 fájl törlése a helyi adatbázisból nem sikerült</translation>
</message> </message>
@ -3527,7 +3682,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation>A(z) %1 fájlrekord törlése a helyi adatbázisból nem sikerült</translation> <translation>A(z) %1 fájlrekord törlése a helyi adatbázisból nem sikerült</translation>
</message> </message>
@ -3578,6 +3733,11 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>A(z) %1 fájl módosítási ideje a kiszolgáló szerint érvénytelen. Ne mentse el.</translation> <translation>A(z) %1 fájl módosítási ideje a kiszolgáló szerint érvénytelen. Ne mentse el.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3614,6 +3774,11 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Figyelem, lehetséges kis- és nagybetűk miatti ütközés ennél: %1</translation> <translation>Figyelem, lehetséges kis- és nagybetűk miatti ütközés ennél: %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3650,6 +3815,11 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>A(z) %1 fájl egy helyi fájl névütközése miatt nem nevezhető ár erre: %2, </translation> <translation>A(z) %1 fájl egy helyi fájl névütközése miatt nem nevezhető ár erre: %2, </translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4501,7 +4671,7 @@ A kiszolgáló hibával válaszolt: %2</translation>
<translation>Nem sikerült frissíteni a fájl metaadatait: %1</translation> <translation>Nem sikerült frissíteni a fájl metaadatait: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>A fájlrekord beállítása a helyi adatbázisban nem sikerült: %1</translation> <translation>A fájlrekord beállítása a helyi adatbázisban nem sikerült: %1</translation>
</message> </message>
@ -4733,6 +4903,12 @@ A kiszolgáló hibával válaszolt: %2</translation>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Összes feltöltés újrapróbálása</translation> <translation>Összes feltöltés újrapróbálása</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5918,6 +6094,11 @@ A kiszolgáló hibával válaszolt: %2</translation>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>A kiszolgáló verziója letöltve, a módosított helyi fájl ütközésfájlba másolva</translation> <translation>A kiszolgáló verziója letöltve, a módosított helyi fájl ütközésfájlba másolva</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3360,6 +3510,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3401,7 +3556,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3459,7 +3614,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3499,7 +3654,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3550,6 +3705,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3586,6 +3746,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3622,6 +3787,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4469,7 +4639,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4701,6 +4871,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5886,6 +6062,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1044,6 +1044,156 @@ gagnageymslur: </translation>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3363,6 +3513,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3404,7 +3559,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3462,7 +3617,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3502,7 +3657,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3553,6 +3708,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3589,6 +3749,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3625,6 +3790,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4474,7 +4644,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4706,6 +4876,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Prófa aftur allar innsendingar</translation> <translation>Prófa aftur allar innsendingar</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5893,6 +6069,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Sótti útgáfu þjóns, afritaði breytta staðværa skrá yfir í árekstraskrá</translation> <translation>Sótti útgáfu þjóns, afritaði breytta staðværa skrá yfir í árekstraskrá</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1044,6 +1044,156 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione
<translation>Ripristini falliti: %1</translation> <translation>Ripristini falliti: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3377,6 +3527,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Conflitto: versione del server scaricata, copia locale rinominata e non caricata.</translation> <translation>Conflitto: versione del server scaricata, copia locale rinominata e non caricata.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3418,7 +3573,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Impossibile sincronizzare a causa di un orario di modifica non valido</translation> <translation>Impossibile sincronizzare a causa di un orario di modifica non valido</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation>Errore nella rilevazione del record del file %1 dal database</translation> <translation>Errore nella rilevazione del record del file %1 dal database</translation>
</message> </message>
@ -3476,7 +3631,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation>impossibile eliminare il file %1 dal DB locale</translation> <translation>impossibile eliminare il file %1 dal DB locale</translation>
</message> </message>
@ -3516,7 +3671,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation>Impossibile eliminare il record del file %1 dal DB locale</translation> <translation>Impossibile eliminare il record del file %1 dal DB locale</translation>
</message> </message>
@ -3567,6 +3722,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Il file %1 ha un orario di modifica non valido segnalato dal server. Non salvarlo.</translation> <translation>Il file %1 ha un orario di modifica non valido segnalato dal server. Non salvarlo.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3603,6 +3763,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Attenzione, possibile conflitto relativo all&apos;uso di maiuscole e minuscole con %1</translation> <translation>Attenzione, possibile conflitto relativo all&apos;uso di maiuscole e minuscole con %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3639,6 +3804,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>Il file %1 non può essere rinominato in %2 per un conflitto con il nome di un file locale</translation> <translation>Il file %1 non può essere rinominato in %2 per un conflitto con il nome di un file locale</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4488,7 +4658,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>Impossibile impostare il record del file nel DB locale: %1</translation> <translation>Impossibile impostare il record del file nel DB locale: %1</translation>
</message> </message>
@ -4720,6 +4890,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Riprova tutti i caricamenti</translation> <translation>Riprova tutti i caricamenti</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5905,6 +6081,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Versione del server scaricata, il file locale modificato è stato copiato come file di conflitto</translation> <translation>Versione del server scaricata, il file locale modificato è stato copiato come file di conflitto</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1044,6 +1044,156 @@ This action will abort any currently running synchronization.</source>
<translation>: %1</translation> <translation>: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3385,6 +3535,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>コンフリクト: サーバーのバージョンがダウンロードされて</translation> <translation>コンフリクト: サーバーのバージョンがダウンロードされて</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3426,7 +3581,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3484,7 +3639,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3524,7 +3679,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3575,6 +3730,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation> %1 </translation> <translation> %1 </translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3611,6 +3771,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>: %1 </translation> <translation>: %1 </translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3647,6 +3812,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation> %1 %2 </translation> <translation> %1 %2 </translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4496,7 +4666,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4728,6 +4898,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5913,6 +6089,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1044,6 +1044,156 @@ This action will abort any currently running synchronization.</source>
<translation> : %1</translation> <translation> : %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3389,6 +3539,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>충돌: 서버 .</translation> <translation>충돌: 서버 .</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3430,7 +3585,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation> .</translation> <translation> .</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation> %1() </translation> <translation> %1() </translation>
</message> </message>
@ -3488,7 +3643,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation> %1() </translation> <translation> %1() </translation>
</message> </message>
@ -3528,7 +3683,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation> %1() </translation> <translation> %1() </translation>
</message> </message>
@ -3579,6 +3734,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>%1 . .</translation> <translation>%1 . .</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3615,6 +3775,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>, %1 </translation> <translation>, %1 </translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3651,6 +3816,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation> %1 %2 .</translation> <translation> %1 %2 .</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4500,7 +4670,7 @@ Server replied with error: %2</source>
<translation> : %1</translation> <translation> : %1</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation> %1() </translation> <translation> %1() </translation>
</message> </message>
@ -4732,6 +4902,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5917,6 +6093,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation> , </translation> <translation> , </translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1040,6 +1040,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3364,6 +3514,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3405,7 +3560,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3463,7 +3618,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3503,7 +3658,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3554,6 +3709,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3590,6 +3750,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Dėmesio, galimas didžiųjų ir mažųjų raidžių nesuderinamumas su failu %1</translation> <translation>Dėmesio, galimas didžiųjų ir mažųjų raidžių nesuderinamumas su failu %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3626,6 +3791,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4475,7 +4645,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4707,6 +4877,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Pakartoti visus įkėlimus</translation> <translation>Pakartoti visus įkėlimus</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5892,6 +6068,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Atsisiųsta serverio versija, kompiuteryje esantis failas nukopijuotas į konfliktų failą</translation> <translation>Atsisiųsta serverio versija, kompiuteryje esantis failas nukopijuotas į konfliktų failą</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4463,7 +4633,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4695,6 +4865,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5880,6 +6056,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Servera versija lejupielādēta, kopēta izmainīta lokālā datne uz konfliktēto datni</translation> <translation>Servera versija lejupielādēta, kopēta izmainīta lokālā datne uz konfliktēto datni</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3361,6 +3511,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Конфликт: Верзијата од серверот е преземена, локалната верзија е преименувана и не е прикачена на серверот.</translation> <translation>Конфликт: Верзијата од серверот е преземена, локалната верзија е преименувана и не е прикачена на серверот.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3402,7 +3557,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3460,7 +3615,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3500,7 +3655,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3551,6 +3706,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3587,6 +3747,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3623,6 +3788,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4472,7 +4642,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4704,6 +4874,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Повтори ги сите прикачувања</translation> <translation>Повтори ги сите прикачувања</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5889,6 +6065,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Верзијата од серверот е преземена, преименувана е изменетата локална верзија во конфликт датотека</translation> <translation>Верзијата од серверот е преземена, преименувана е изменетата локална верзија во конфликт датотека</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1044,6 +1044,156 @@ Denne handlingen vil avbryte enhver synkronisering som kjører.</translation>
<translation>Gjenoppretting feilet: %1</translation> <translation>Gjenoppretting feilet: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3362,6 +3512,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3403,7 +3558,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3461,7 +3616,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3501,7 +3656,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3552,6 +3707,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3588,6 +3748,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Merk! mulig sammenfall med %1 pga. sensitivitet for store/små bokstaver</translation> <translation>Merk! mulig sammenfall med %1 pga. sensitivitet for store/små bokstaver</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3624,6 +3789,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4473,7 +4643,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4705,6 +4875,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Prøv alle opplastinger igjen</translation> <translation>Prøv alle opplastinger igjen</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5890,6 +6066,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Server-versjon lastet ned, kopierte endret lokal fil til konfliktfil</translation> <translation>Server-versjon lastet ned, kopierte endret lokal fil til konfliktfil</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1043,6 +1043,156 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.</translati
<translation>Herstellen mislukt: %1</translation> <translation>Herstellen mislukt: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3389,6 +3539,11 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Bestandsconflict: serverversie is gedownload, de lokale kopie is hernoemd en niet geüpload</translation> <translation>Bestandsconflict: serverversie is gedownload, de lokale kopie is hernoemd en niet geüpload</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3430,7 +3585,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3488,7 +3643,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3528,7 +3683,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3579,6 +3734,11 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Bestand %1 heeft een ongeldige wijzigingstijd gerapporteerd door de server. Bewaar het niet.</translation> <translation>Bestand %1 heeft een ongeldige wijzigingstijd gerapporteerd door de server. Bewaar het niet.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3615,6 +3775,11 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Let op, mogelijk conflict hoofdlettergevoeligheid met 1%</translation> <translation>Let op, mogelijk conflict hoofdlettergevoeligheid met 1%</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3651,6 +3816,11 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>Bestand %1 kan niet worden hernoemd naar %2, omdat de naam conflicteert met een lokaal bestand</translation> <translation>Bestand %1 kan niet worden hernoemd naar %2, omdat de naam conflicteert met een lokaal bestand</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4500,7 +4670,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4732,6 +4902,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Probeer alle uploads opnieuw</translation> <translation>Probeer alle uploads opnieuw</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5917,6 +6093,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Serverversie gedownload, gewijzigde lokale bestand gekopieerd in conflictbestand</translation> <translation>Serverversie gedownload, gewijzigde lokale bestand gekopieerd in conflictbestand</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3352,6 +3502,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3393,7 +3548,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3451,7 +3606,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3491,7 +3646,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3542,6 +3697,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3578,6 +3738,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3614,6 +3779,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4463,7 +4633,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4695,6 +4865,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Tornar enviar totes los fichièrs</translation> <translation>Tornar enviar totes los fichièrs</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5880,6 +6056,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Version del servidor telecargada, copiada del fichièr local en conflicte </translation> <translation>Version del servidor telecargada, copiada del fichièr local en conflicte </translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1045,6 +1045,156 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans
<translation>Przywracanie nie powiodło się: %1</translation> <translation>Przywracanie nie powiodło się: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3387,6 +3537,11 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Konflikt: Pobrano wersję z serwera, nazwa lokalnej kopii została zmieniona i nie wysłana.</translation> <translation>Konflikt: Pobrano wersję z serwera, nazwa lokalnej kopii została zmieniona i nie wysłana.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3428,7 +3583,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Nie można zsynchronizować z powodu nieprawidłowego czasu modyfikacji</translation> <translation>Nie można zsynchronizować z powodu nieprawidłowego czasu modyfikacji</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation>Błąd podczas usuwania rekordu pliku %1 z bazy danych</translation> <translation>Błąd podczas usuwania rekordu pliku %1 z bazy danych</translation>
</message> </message>
@ -3486,7 +3641,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation>Nie można usunąć pliku %1 z lokalnej bazy danych</translation> <translation>Nie można usunąć pliku %1 z lokalnej bazy danych</translation>
</message> </message>
@ -3526,7 +3681,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation>Nie można usunąć rekordu pliku %1 z lokalnej bazy danych</translation> <translation>Nie można usunąć rekordu pliku %1 z lokalnej bazy danych</translation>
</message> </message>
@ -3577,6 +3732,11 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Plik %1 ma nieprawidłowy czas modyfikacji zgłoszony przez serwer. Nie zapisuj go.</translation> <translation>Plik %1 ma nieprawidłowy czas modyfikacji zgłoszony przez serwer. Nie zapisuj go.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3613,6 +3773,11 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Uwaga, możliwa niezgodność związana z wielością liter w %1</translation> <translation>Uwaga, możliwa niezgodność związana z wielością liter w %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3649,6 +3814,11 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>Nie można zmienić nazwy pliku %1 na %2 z powodu konfliktu nazwy pliku lokalnego</translation> <translation>Nie można zmienić nazwy pliku %1 na %2 z powodu konfliktu nazwy pliku lokalnego</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4500,7 +4670,7 @@ Serwer odpowiedział błędem: %2</translation>
<translation>Nie można zaktualizować metadanych pliku: %1</translation> <translation>Nie można zaktualizować metadanych pliku: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>Nie można ustawić rekordu pliku na lokalną bazę danych: %1</translation> <translation>Nie można ustawić rekordu pliku na lokalną bazę danych: %1</translation>
</message> </message>
@ -4732,6 +4902,12 @@ Serwer odpowiedział błędem: %2</translation>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Ponów wysłanie wszystkich plików</translation> <translation>Ponów wysłanie wszystkich plików</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5917,6 +6093,11 @@ Serwer odpowiedział błędem: %2</translation>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Pobrano wersję z serwera, zmieniona wersja lokalna została skopiowana do pliku konfliktu</translation> <translation>Pobrano wersję z serwera, zmieniona wersja lokalna została skopiowana do pliku konfliktu</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3356,6 +3506,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3397,7 +3552,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3455,7 +3610,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3495,7 +3650,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3546,6 +3701,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3582,6 +3742,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Atenção, possível sensibilidade a maiúsculas em conflito com %1</translation> <translation>Atenção, possível sensibilidade a maiúsculas em conflito com %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3618,6 +3783,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4467,7 +4637,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4699,6 +4869,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5884,6 +6060,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Versão do servidor transferida, ficheiro local alterado copiado para o ficheiro de conflito</translation> <translation>Versão do servidor transferida, ficheiro local alterado copiado para o ficheiro de conflito</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -442,7 +442,7 @@
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="247"/> <location filename="../src/gui/accountsettings.cpp" line="247"/>
<source>Disable encryption</source> <source>Disable encryption</source>
<translation type="unfinished"/> <translation>Desativar criptografia</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="245"/> <location filename="../src/gui/accountsettings.cpp" line="245"/>
@ -634,17 +634,17 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.</tr
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1036"/> <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>Disable end-to-end encryption</source> <source>Disable end-to-end encryption</source>
<translation type="unfinished"/> <translation>Desative a criptografia de ponta a ponta</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1037"/> <location filename="../src/gui/accountsettings.cpp" line="1037"/>
<source>Disable end-to-end encryption for %1?</source> <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/> <translation>Desative a criptografia de ponta a ponta para %1?</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1038"/> <location filename="../src/gui/accountsettings.cpp" line="1038"/>
<source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source> <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source>
<translation type="unfinished"/> <translation>A remoção da criptografia de ponta a ponta removerá os arquivos criptografados localmente sincronizados.&lt;br&gt;Os arquivos criptografados permanecerão no servidor.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1045"/> <location filename="../src/gui/accountsettings.cpp" line="1045"/>
@ -1045,6 +1045,156 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.</tr
<translation>Falha na restauração: %1</translation> <translation>Falha na restauração: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -1866,7 +2016,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="166"/> <location filename="../src/gui/folderstatusmodel.cpp" line="166"/>
<source>Could not decrypt!</source> <source>Could not decrypt!</source>
<translation type="unfinished"/> <translation>Não foi possível descriptografar!</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="162"/> <location filename="../src/gui/folderstatusmodel.cpp" line="162"/>
@ -2611,7 +2761,7 @@ Os itens em que a exclusão é permitida serão excluídos se impedirem a remoç
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
<source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source> <source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/> <translation>&lt;p&gt;Direitos Autorais 2017-2023 Nextcloud GmbH&lt;br /&gt;Direitos Autorais 2012-2023 ownCloud GmbH&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
@ -3385,6 +3535,11 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Conflito: versão do servidor baixada, cópia local renomeada e não carregada. </translation> <translation>Conflito: versão do servidor baixada, cópia local renomeada e não carregada. </translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3426,7 +3581,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Não é possível sincronizar devido ao horário de modificação inválido</translation> <translation>Não é possível sincronizar devido ao horário de modificação inválido</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation>Erro ao excluir o registro de arquivo %1 do banco de dados</translation> <translation>Erro ao excluir o registro de arquivo %1 do banco de dados</translation>
</message> </message>
@ -3484,7 +3639,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation>não foi possível eliminar o arquivo %1 do BD local</translation> <translation>não foi possível eliminar o arquivo %1 do BD local</translation>
</message> </message>
@ -3524,7 +3679,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation>Não foi possível excluir o registro de arquivo %1 do BD local</translation> <translation>Não foi possível excluir o registro de arquivo %1 do BD local</translation>
</message> </message>
@ -3575,6 +3730,11 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>O arquivo %1 possui erro na data/hora modificada informado pelo servidor. Não salvar.</translation> <translation>O arquivo %1 possui erro na data/hora modificada informado pelo servidor. Não salvar.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3611,6 +3771,11 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Atenção, possível caso de conflito de minúscula/maiúscula com %1</translation> <translation>Atenção, possível caso de conflito de minúscula/maiúscula com %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3647,6 +3812,11 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>O arquivo %1 não pode ser renomeada para %2 devido a um conflito com o nome de um arquivo local</translation> <translation>O arquivo %1 não pode ser renomeada para %2 devido a um conflito com o nome de um arquivo local</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4498,7 +4668,7 @@ Servidor respondeu com erro: %2</translation>
<translation>Não foi possível atualizar os metadados do arquivo: %1</translation> <translation>Não foi possível atualizar os metadados do arquivo: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>Não foi possível definir o registro do arquivo para o BD local: %1</translation> <translation>Não foi possível definir o registro do arquivo para o BD local: %1</translation>
</message> </message>
@ -4730,6 +4900,12 @@ Servidor respondeu com erro: %2</translation>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Retentar todos os envios</translation> <translation>Retentar todos os envios</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5915,6 +6091,11 @@ Servidor respondeu com erro: %2</translation>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Versão do servidor baixada, copiada a modificação do local do arquivo dentro do arquivo de conflito</translation> <translation>Versão do servidor baixada, copiada a modificação do local do arquivo dentro do arquivo de conflito</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1044,6 +1044,156 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.</
<translation>Restaurarea a eșuat: %1</translation> <translation>Restaurarea a eșuat: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3368,6 +3518,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3409,7 +3564,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3467,7 +3622,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3507,7 +3662,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3558,6 +3713,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3594,6 +3754,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3630,6 +3795,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4477,7 +4647,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4709,6 +4879,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5894,6 +6070,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1043,6 +1043,156 @@ This action will abort any currently running synchronization.</source>
<translation>Восстановление не удалось: %1</translation> <translation>Восстановление не удалось: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3383,6 +3533,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Конфликт: загружена версия файла с сервера, а локальная копия переименована и не передана на сервер.</translation> <translation>Конфликт: загружена версия файла с сервера, а локальная копия переименована и не передана на сервер.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3424,7 +3579,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Синхронизация невозможна по причине некорректного времени изменения файла</translation> <translation>Синхронизация невозможна по причине некорректного времени изменения файла</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation>Не удалось удалить из базы данных запись %1</translation> <translation>Не удалось удалить из базы данных запись %1</translation>
</message> </message>
@ -3482,7 +3637,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation>не удалось удалить файл %1 из локальной базы данных</translation> <translation>не удалось удалить файл %1 из локальной базы данных</translation>
</message> </message>
@ -3522,7 +3677,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation>Не удалось удалить запись о файле %1 из локальной базы данных</translation> <translation>Не удалось удалить запись о файле %1 из локальной базы данных</translation>
</message> </message>
@ -3573,6 +3728,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Файл %1 имеет неверное время изменения, сообщенное сервером. Не сохраняйте его.</translation> <translation>Файл %1 имеет неверное время изменения, сообщенное сервером. Не сохраняйте его.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3609,6 +3769,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Внимание, возможен конфликт чувствительности к регистру имён с «%1»</translation> <translation>Внимание, возможен конфликт чувствительности к регистру имён с «%1»</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3645,6 +3810,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>Файл %1 не может быть переименован в %2 из-за локального конфликта имён</translation> <translation>Файл %1 не может быть переименован в %2 из-за локального конфликта имён</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4494,7 +4664,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>Не удалось сохранить запись о файле %1 в локальную базу данных</translation> <translation>Не удалось сохранить запись о файле %1 в локальную базу данных</translation>
</message> </message>
@ -4726,6 +4896,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Повторить передачу файлов на сервер</translation> <translation>Повторить передачу файлов на сервер</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5911,6 +6087,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Версия файла с сервера скачана, а изменённый локальный файл скопирован в конфликтующую версию.</translation> <translation>Версия файла с сервера скачана, а изменённый локальный файл скопирован в конфликтующую версию.</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1044,6 +1044,156 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.</
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3386,6 +3536,11 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Cunflitu: versione de su serbidore iscarrigada, còpia locale torrada a numenare e non carrigada.</translation> <translation>Cunflitu: versione de su serbidore iscarrigada, còpia locale torrada a numenare e non carrigada.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3427,7 +3582,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3485,7 +3640,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3525,7 +3680,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3576,6 +3731,11 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3612,6 +3772,11 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Avisu, podet dare chi ddoe est un&apos;errore dèpidu a s&apos;impreu de is maiùsculas o minùsculas cun %1</translation> <translation>Avisu, podet dare chi ddoe est un&apos;errore dèpidu a s&apos;impreu de is maiùsculas o minùsculas cun %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3648,6 +3813,11 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>S&apos;archìviu %1 non faghet a ddu torrare a numenare %2 pro unu cunflitu cun su nùmene de s&apos;archìviu locale</translation> <translation>S&apos;archìviu %1 non faghet a ddu torrare a numenare %2 pro unu cunflitu cun su nùmene de s&apos;archìviu locale</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4497,7 +4667,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4729,6 +4899,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Torra a proare totu is carrigamentos</translation> <translation>Torra a proare totu is carrigamentos</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5914,6 +6090,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Versione de su serbidore iscarrigada, s&apos;archìviu locale modificadu est istadu copiadu comente archìviu de cunflitu</translation> <translation>Versione de su serbidore iscarrigada, s&apos;archìviu locale modificadu est istadu copiadu comente archìviu de cunflitu</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1044,6 +1044,156 @@ Táto akcia zruší všetky prebiehajúce synchronizácie.</translation>
<translation>Obnovenie zlyhalo: %1</translation> <translation>Obnovenie zlyhalo: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3386,6 +3536,11 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Konflikt: Prevzatá verzia zo servera, lokálna kópia premenovaná a neodovzdaná.</translation> <translation>Konflikt: Prevzatá verzia zo servera, lokálna kópia premenovaná a neodovzdaná.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3427,7 +3582,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<translation>Chyba pri synchronizácii z dôvodu neplatného času poslednej zmeny</translation> <translation>Chyba pri synchronizácii z dôvodu neplatného času poslednej zmeny</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation>Chyba pri mazaní záznamu o súbore %1 z databázy</translation> <translation>Chyba pri mazaní záznamu o súbore %1 z databázy</translation>
</message> </message>
@ -3485,7 +3640,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation>nie je možné vymazať súbor %1 z lokálnej DB</translation> <translation>nie je možné vymazať súbor %1 z lokálnej DB</translation>
</message> </message>
@ -3525,7 +3680,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation>Nie je možné vymazať záznam o súbore %1 z lokálnej DB</translation> <translation>Nie je možné vymazať záznam o súbore %1 z lokálnej DB</translation>
</message> </message>
@ -3576,6 +3731,11 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Súbor %1 neplatný čas poslednej zmeny nahlásený serverom. Neukladajte si to.</translation> <translation>Súbor %1 neplatný čas poslednej zmeny nahlásený serverom. Neukladajte si to.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3612,6 +3772,11 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Pozor, možná kolízia z dôvodu veľkosti písmen s %1</translation> <translation>Pozor, možná kolízia z dôvodu veľkosti písmen s %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3648,6 +3813,11 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>Súbor %1 nemôže byť premenovaný na %2 z dôvodu, že tento názov je použitý</translation> <translation>Súbor %1 nemôže byť premenovaný na %2 z dôvodu, že tento názov je použitý</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4497,7 +4667,7 @@ Server replied with error: %2</source>
<translation>Nemôžem aktualizovať metadáta súboru: %1</translation> <translation>Nemôžem aktualizovať metadáta súboru: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>Nie je možné vytvoriť záznam o súbore v lokálnej DB: %1</translation> <translation>Nie je možné vytvoriť záznam o súbore v lokálnej DB: %1</translation>
</message> </message>
@ -4729,6 +4899,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Zopakovať všetky nahrávania</translation> <translation>Zopakovať všetky nahrávania</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5914,6 +6090,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Verzia zo servera bola stiahnutá, kópia zmenila lokálny súbor na konfliktný súbor</translation> <translation>Verzia zo servera bola stiahnutá, kópia zmenila lokálny súbor na konfliktný súbor</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1044,6 +1044,156 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.</trans
<translation>Obnovitev je spodletela: %1</translation> <translation>Obnovitev je spodletela: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3386,6 +3536,11 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Spor: prejeta je strežniška različica, krajevna je preimenovana, a ne tudi poslana v oblak. </translation> <translation>Spor: prejeta je strežniška različica, krajevna je preimenovana, a ne tudi poslana v oblak. </translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3427,7 +3582,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3485,7 +3640,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3525,7 +3680,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3576,6 +3731,11 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3612,6 +3772,11 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Pozor! Mogoče je neskladje v velikosti črk imena %1</translation> <translation>Pozor! Mogoče je neskladje v velikosti črk imena %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3648,6 +3813,11 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>Datoteke %1 ni mogoče preimenovati v %2 zaradi že obstoječe datoteke s tem imenom.</translation> <translation>Datoteke %1 ni mogoče preimenovati v %2 zaradi že obstoječe datoteke s tem imenom.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4497,7 +4667,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4729,6 +4899,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Ponovi pošiljanje vseh predmetov</translation> <translation>Ponovi pošiljanje vseh predmetov</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5914,6 +6090,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Strežniška različica je prejeta, v datoteko sporov pa je bila kopirana tudi spremenjena krajevna datoteka</translation> <translation>Strežniška različica je prejeta, v datoteko sporov pa je bila kopirana tudi spremenjena krajevna datoteka</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1040,6 +1040,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3364,6 +3514,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3405,7 +3560,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3463,7 +3618,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3503,7 +3658,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3554,6 +3709,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3590,6 +3750,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Пажња! Могуће сударање због величине слова са %1</translation> <translation>Пажња! Могуће сударање због величине слова са %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3626,6 +3791,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4475,7 +4645,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4707,6 +4877,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Понови сва отпремања</translation> <translation>Понови сва отпремања</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5892,6 +6068,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Скинута серверска верзија, копирам измењени локални фајл у конфликтни фајл</translation> <translation>Скинута серверска верзија, копирам измењени локални фајл у конфликтни фајл</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -442,7 +442,7 @@
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="247"/> <location filename="../src/gui/accountsettings.cpp" line="247"/>
<source>Disable encryption</source> <source>Disable encryption</source>
<translation type="unfinished"/> <translation>Inaktivera kryptering</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="245"/> <location filename="../src/gui/accountsettings.cpp" line="245"/>
@ -634,17 +634,17 @@ Den här åtgärden avbryter alla synkroniseringar som körs.</translation>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1036"/> <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>Disable end-to-end encryption</source> <source>Disable end-to-end encryption</source>
<translation type="unfinished"/> <translation>Inaktivera ändpunkt-till-ändpunkt-kryptering</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1037"/> <location filename="../src/gui/accountsettings.cpp" line="1037"/>
<source>Disable end-to-end encryption for %1?</source> <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/> <translation>Inaktivera ändpunkt-till-ändpunkt-kryptering för %1?</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1038"/> <location filename="../src/gui/accountsettings.cpp" line="1038"/>
<source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source> <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source>
<translation type="unfinished"/> <translation>Om du tar bort ändpunkt-till-ändpunkt-kryptering tar du bort lokalt synkroniserade filer som är krypterade.&lt;br&gt;Krypterade filer kommer att finnas kvar servern.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1045"/> <location filename="../src/gui/accountsettings.cpp" line="1045"/>
@ -1045,6 +1045,156 @@ Den här åtgärden avbryter alla synkroniseringar som körs.</translation>
<translation>Återställning misslyckades: %1</translation> <translation>Återställning misslyckades: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -1868,7 +2018,7 @@ Om detta var ett misstag och du vill behålla dina filer, kommer de att synkroni
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="166"/> <location filename="../src/gui/folderstatusmodel.cpp" line="166"/>
<source>Could not decrypt!</source> <source>Could not decrypt!</source>
<translation type="unfinished"/> <translation>Kunde inte dekryptera!</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="162"/> <location filename="../src/gui/folderstatusmodel.cpp" line="162"/>
@ -2324,7 +2474,9 @@ Om detta var ett misstag och du vill behålla dina filer, kommer de att synkroni
<source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; channel may contain newer features and bugfixes, but have not yet been tested thoroughly. <source>The update channel determines which client updates will be offered for installation. The &quot;stable&quot; channel contains only upgrades that are considered reliable, while the versions in the &quot;beta&quot; 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> 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"/> <translation>Uppdateringskanalen avgör vilka klientuppdateringar som kommer att erbjudas för installation. Den &quot;stabila&quot; kanalen innehåller endast uppgraderingar som anses tillförlitliga, medan versionerna i &quot;beta&quot;-kanalen kan innehålla nyare funktioner och buggfixar, men har ännu inte testats ordentligt.
Observera att detta endast väljer vilken pool uppgraderingar tas från, och att det inte finns några nedgraderingar: att tillbaka från betakanalen till den stabila kanalen kan vanligtvis inte göras omedelbart och innebär att vänta en stabil version som är nyare än den för närvarande installerade betaversionen.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/generalsettings.cpp" line="374"/> <location filename="../src/gui/generalsettings.cpp" line="374"/>
@ -2611,7 +2763,7 @@ Objekt där radering är tillåtet raderas om de förhindrar att en mapp tas bor
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
<source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source> <source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/> <translation>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
@ -3385,6 +3537,11 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Konflikt: Serverversion hämtad, lokal kopia omdöpt och inte uppladdad.</translation> <translation>Konflikt: Serverversion hämtad, lokal kopia omdöpt och inte uppladdad.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3426,7 +3583,7 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda
<translation>Det går inte att synkronisera grund av ogiltig ändringstid</translation> <translation>Det går inte att synkronisera grund av ogiltig ändringstid</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation>Fel vid borttagning av filpost %1 från databasen</translation> <translation>Fel vid borttagning av filpost %1 från databasen</translation>
</message> </message>
@ -3484,7 +3641,7 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation>Kunde inte ta bort filen %1 från lokal DB</translation> <translation>Kunde inte ta bort filen %1 från lokal DB</translation>
</message> </message>
@ -3524,7 +3681,7 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation>Kunde inte ta bort filposten %1 från lokal DB</translation> <translation>Kunde inte ta bort filposten %1 från lokal DB</translation>
</message> </message>
@ -3575,6 +3732,11 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Filen %1 har en ogiltig ändringstid rapporterad av servern. Spara den inte.</translation> <translation>Filen %1 har en ogiltig ändringstid rapporterad av servern. Spara den inte.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3611,6 +3773,11 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Observera, eventuell skiftlägeskänslig konflikt med %1</translation> <translation>Observera, eventuell skiftlägeskänslig konflikt med %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3647,6 +3814,11 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>Filen %1 kan inte döpas om till %2 grund av namnkonflikt med en lokal fil</translation> <translation>Filen %1 kan inte döpas om till %2 grund av namnkonflikt med en lokal fil</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4498,7 +4670,7 @@ Servern svarade med fel: %2</translation>
<translation>Kunde inte uppdatera filens metadata: %1</translation> <translation>Kunde inte uppdatera filens metadata: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>Kunde inte ställa in filposten till lokal DB: %1</translation> <translation>Kunde inte ställa in filposten till lokal DB: %1</translation>
</message> </message>
@ -4730,6 +4902,12 @@ Servern svarade med fel: %2</translation>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Försök ladda upp igen</translation> <translation>Försök ladda upp igen</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5915,6 +6093,11 @@ Servern svarade med fel: %2</translation>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Serverversion hämtad, kopierade den ändrade lokala filen till konfliktfil</translation> <translation>Serverversion hämtad, kopierade den ändrade lokala filen till konfliktfil</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3358,6 +3508,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3399,7 +3554,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3457,7 +3612,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3497,7 +3652,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3548,6 +3703,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3584,6 +3744,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation> %1</translation> <translation> %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3620,6 +3785,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4468,7 +4638,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4700,6 +4870,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5885,6 +6061,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -442,7 +442,7 @@
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="247"/> <location filename="../src/gui/accountsettings.cpp" line="247"/>
<source>Disable encryption</source> <source>Disable encryption</source>
<translation type="unfinished"/> <translation>Şifreleme kullanılmasın</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="245"/> <location filename="../src/gui/accountsettings.cpp" line="245"/>
@ -634,17 +634,17 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</transl
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1036"/> <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>Disable end-to-end encryption</source> <source>Disable end-to-end encryption</source>
<translation type="unfinished"/> <translation>Uçtan uca şifreleme kullanılmasın</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1037"/> <location filename="../src/gui/accountsettings.cpp" line="1037"/>
<source>Disable end-to-end encryption for %1?</source> <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/> <translation>%1 için uçtan uca şifreleme kapatılsın mı?</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1038"/> <location filename="../src/gui/accountsettings.cpp" line="1038"/>
<source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source> <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source>
<translation type="unfinished"/> <translation>Uçtan uca şifrelemenin kapatılması, yerel olarak eşitlenmiş şifrelenmiş dosyaları kaldırır.&lt;br&gt;Şifrelenmiş dosyalar sunucuda kalır.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1045"/> <location filename="../src/gui/accountsettings.cpp" line="1045"/>
@ -1045,6 +1045,156 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</transl
<translation>Geri yüklenemedi: %1</translation> <translation>Geri yüklenemedi: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -1867,7 +2017,7 @@ Bu işlemi yanlışlıkla yaptıysanız ve dosyalarınızı korumak istiyorsanı
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="166"/> <location filename="../src/gui/folderstatusmodel.cpp" line="166"/>
<source>Could not decrypt!</source> <source>Could not decrypt!</source>
<translation type="unfinished"/> <translation>Şifre çözülemedi!</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="162"/> <location filename="../src/gui/folderstatusmodel.cpp" line="162"/>
@ -2612,7 +2762,7 @@ Silme izni verildiğinde bir klasörün silinmesini engelleyen ögeler silinir.
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
<source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source> <source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/> <translation>&lt;p&gt;Telif hakları 2017-2023 Nextcloud GmbH&lt;br /&gt;Telif hakları 2012-2023 ownCloud GmbH&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
@ -3386,6 +3536,11 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Çakışma: Sunucu sürümü indirildi, yerel kopya yeniden adlandırıldı ve yüklenmedi.</translation> <translation>Çakışma: Sunucu sürümü indirildi, yerel kopya yeniden adlandırıldı ve yüklenmedi.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3427,7 +3582,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Değiştirilme zamanı geçersiz olduğundan eşitlenemedi</translation> <translation>Değiştirilme zamanı geçersiz olduğundan eşitlenemedi</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation>%1 dosya kaydı veritabanından silinirken sorun çıktı</translation> <translation>%1 dosya kaydı veritabanından silinirken sorun çıktı</translation>
</message> </message>
@ -3485,7 +3640,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation>%1 dosyası yerel veritabanından silinemedi</translation> <translation>%1 dosyası yerel veritabanından silinemedi</translation>
</message> </message>
@ -3525,7 +3680,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation>%1 dosya kaydı yerel veritabanından silinemedi</translation> <translation>%1 dosya kaydı yerel veritabanından silinemedi</translation>
</message> </message>
@ -3576,6 +3731,11 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Sunucu tarafından bildirilen %1 dosyasının değiştirilme tarihi geçersiz. Kaydedilmedi.</translation> <translation>Sunucu tarafından bildirilen %1 dosyasının değiştirilme tarihi geçersiz. Kaydedilmedi.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3612,6 +3772,11 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Uyarı, %1 ile olası büyük küçük harf duyarlılığı çakışması</translation> <translation>Uyarı, %1 ile olası büyük küçük harf duyarlılığı çakışması</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3648,6 +3813,11 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>Yerel bir dosya adı ile çakışması nedeniyle %1 dosyası %2 olarak adlandırılamadı</translation> <translation>Yerel bir dosya adı ile çakışması nedeniyle %1 dosyası %2 olarak adlandırılamadı</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4499,7 +4669,7 @@ Sunucunun verdiği hata yanıtı: %2</translation>
<translation>Dosya üst verileri güncellenemedi: %1</translation> <translation>Dosya üst verileri güncellenemedi: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>Dosya kaydı yerel veritabanına yapılamadı: %1</translation> <translation>Dosya kaydı yerel veritabanına yapılamadı: %1</translation>
</message> </message>
@ -4731,6 +4901,12 @@ Sunucunun verdiği hata yanıtı: %2</translation>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Tüm yüklemeleri yinele</translation> <translation>Tüm yüklemeleri yinele</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5916,6 +6092,11 @@ Sunucunun verdiği hata yanıtı: %2</translation>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Sunucu sürümü indirildi, değiştirilmiş yerel dosya çakışan dosya içine kopyalandı</translation> <translation>Sunucu sürümü indirildi, değiştirilmiş yerel dosya çakışan dosya içine kopyalandı</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1044,6 +1044,156 @@ This action will abort any currently running synchronization.</source>
<translation>Відновлення не вдалося: %1</translation> <translation>Відновлення не вдалося: %1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3386,6 +3536,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Конфлікт: Звантажено версію з хмари, копію на пристрої перейменовано і не завантажено.</translation> <translation>Конфлікт: Звантажено версію з хмари, копію на пристрої перейменовано і не завантажено.</translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3427,7 +3582,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Неможливо виконати синхронізацію через неправильний час модифікації</translation> <translation>Неможливо виконати синхронізацію через неправильний час модифікації</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation>Помилка під час вилучення запису файлу %1 з бази даних</translation> <translation>Помилка під час вилучення запису файлу %1 з бази даних</translation>
</message> </message>
@ -3485,7 +3640,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation>неможливо вилучити файл %1 з локальною БД</translation> <translation>неможливо вилучити файл %1 з локальною БД</translation>
</message> </message>
@ -3525,7 +3680,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation>Неможливо вилучити запис файлу %1 з локальної БД</translation> <translation>Неможливо вилучити запис файлу %1 з локальної БД</translation>
</message> </message>
@ -3576,6 +3731,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation>Сервер визначив, що файл %1 має неправильний час зміни. Не зберігайте його.</translation> <translation>Сервер визначив, що файл %1 має неправильний час зміни. Не зберігайте його.</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3612,6 +3772,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>Увага, можливий конфлікт чутливості до реєстру з %1</translation> <translation>Увага, можливий конфлікт чутливості до реєстру з %1</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3648,6 +3813,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation>Файл %1 неможливо перейменувати у %2 через конфлікт з назвою файлу на пристрої</translation> <translation>Файл %1 неможливо перейменувати у %2 через конфлікт з назвою файлу на пристрої</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4497,7 +4667,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>Неможливо встановити запис файлу до локальної БД: %1</translation> <translation>Неможливо встановити запис файлу до локальної БД: %1</translation>
</message> </message>
@ -4729,6 +4899,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation>Првторити усі завантаження</translation> <translation>Првторити усі завантаження</translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5914,6 +6090,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Серверну версію звантажено, скопійовано змінений на пристрої файл до конфліктного файлу</translation> <translation>Серверну версію звантажено, скопійовано змінений на пристрої файл до конфліктного файлу</translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -1041,6 +1041,156 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -3374,6 +3524,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3415,7 +3570,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3473,7 +3628,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3513,7 +3668,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -3564,6 +3719,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation> %1 </translation> <translation> %1 </translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3600,6 +3760,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>%1 </translation> <translation>%1 </translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3636,6 +3801,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation> %1 %2</translation> <translation> %1 %2</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4485,7 +4655,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/> <translation type="unfinished"/>
</message> </message>
@ -4717,6 +4887,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5902,6 +6078,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -443,7 +443,7 @@
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="247"/> <location filename="../src/gui/accountsettings.cpp" line="247"/>
<source>Disable encryption</source> <source>Disable encryption</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="245"/> <location filename="../src/gui/accountsettings.cpp" line="245"/>
@ -635,17 +635,17 @@ This action will abort any currently running synchronization.</source>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1036"/> <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>Disable end-to-end encryption</source> <source>Disable end-to-end encryption</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1037"/> <location filename="../src/gui/accountsettings.cpp" line="1037"/>
<source>Disable end-to-end encryption for %1?</source> <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/> <translation> %1 </translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1038"/> <location filename="../src/gui/accountsettings.cpp" line="1038"/>
<source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source> <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source>
<translation type="unfinished"/> <translation>&lt;br&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1045"/> <location filename="../src/gui/accountsettings.cpp" line="1045"/>
@ -1046,6 +1046,156 @@ This action will abort any currently running synchronization.</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -1867,7 +2017,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="166"/> <location filename="../src/gui/folderstatusmodel.cpp" line="166"/>
<source>Could not decrypt!</source> <source>Could not decrypt!</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="162"/> <location filename="../src/gui/folderstatusmodel.cpp" line="162"/>
@ -2612,7 +2762,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
<source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source> <source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/> <translation>&lt;p&gt; 2017-2023 Nextcloud GmbH &lt;br /&gt;2012-2023 ownCloud GmbH &lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
@ -3386,6 +3536,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3427,7 +3582,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation> %1 </translation> <translation> %1 </translation>
</message> </message>
@ -3485,7 +3640,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation> %1</translation> <translation> %1</translation>
</message> </message>
@ -3525,7 +3680,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation> %1</translation> <translation> %1</translation>
</message> </message>
@ -3576,6 +3731,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation> %1 </translation> <translation> %1 </translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3612,6 +3772,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>! %1 </translation> <translation>! %1 </translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3648,6 +3813,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation> %1 %2</translation> <translation> %1 %2</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4499,7 +4669,7 @@ Server replied with error: %2</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>: %1</translation> <translation>: %1</translation>
</message> </message>
@ -4731,6 +4901,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5916,6 +6092,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>

View file

@ -442,7 +442,7 @@
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="247"/> <location filename="../src/gui/accountsettings.cpp" line="247"/>
<source>Disable encryption</source> <source>Disable encryption</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="245"/> <location filename="../src/gui/accountsettings.cpp" line="245"/>
@ -634,17 +634,17 @@ This action will abort any currently running synchronization.</source>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1036"/> <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>Disable end-to-end encryption</source> <source>Disable end-to-end encryption</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1037"/> <location filename="../src/gui/accountsettings.cpp" line="1037"/>
<source>Disable end-to-end encryption for %1?</source> <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/> <translation> %1 </translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1038"/> <location filename="../src/gui/accountsettings.cpp" line="1038"/>
<source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source> <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source>
<translation type="unfinished"/> <translation>&lt;br&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsettings.cpp" line="1045"/> <location filename="../src/gui/accountsettings.cpp" line="1045"/>
@ -783,17 +783,17 @@ This action will abort any currently running synchronization.</source>
<message> <message>
<location filename="../src/gui/accountsetupfromcommandlinejob.cpp" line="142"/> <location filename="../src/gui/accountsetupfromcommandlinejob.cpp" line="142"/>
<source>The authenticated request to the server was redirected to &quot;%1&quot;. The URL is bad, the server is misconfigured.</source> <source>The authenticated request to the server was redirected to &quot;%1&quot;. The URL is bad, the server is misconfigured.</source>
<translation type="unfinished"/> <translation>%1URL </translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsetupfromcommandlinejob.cpp" line="152"/> <location filename="../src/gui/accountsetupfromcommandlinejob.cpp" line="152"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source> <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation type="unfinished"/> <translation>&lt;a href=&quot;%1&quot;&gt;&lt;/a&gt;使</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/accountsetupfromcommandlinejob.cpp" line="160"/> <location filename="../src/gui/accountsetupfromcommandlinejob.cpp" line="160"/>
<source>There was an invalid response to an authenticated WebDAV request</source> <source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/> <translation> WebDAV </translation>
</message> </message>
</context> </context>
<context> <context>
@ -1045,6 +1045,156 @@ This action will abort any currently running synchronization.</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
</context> </context>
<context>
<name>OCC::CaseClashConflictSolver</name>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::CaseClashFilenameDialog</name>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context> <context>
<name>OCC::CleanupPollsJob</name> <name>OCC::CleanupPollsJob</name>
<message> <message>
@ -1868,7 +2018,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="166"/> <location filename="../src/gui/folderstatusmodel.cpp" line="166"/>
<source>Could not decrypt!</source> <source>Could not decrypt!</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="162"/> <location filename="../src/gui/folderstatusmodel.cpp" line="162"/>
@ -2613,7 +2763,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
<source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source> <source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/> <translation>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/legalnotice.cpp" line="55"/> <location filename="../src/gui/legalnotice.cpp" line="55"/>
@ -3387,6 +3537,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="369"/> <location filename="../src/libsync/discovery.cpp" line="369"/>
<source>The filename cannot be encoded on your file system.</source> <source>The filename cannot be encoded on your file system.</source>
@ -3428,7 +3583,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/discovery.cpp" line="953"/> <location filename="../src/libsync/discovery.cpp" line="966"/>
<source>Error while deleting file record %1 from the database</source> <source>Error while deleting file record %1 from the database</source>
<translation> %1 </translation> <translation> %1 </translation>
</message> </message>
@ -3486,7 +3641,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context> <context>
<name>OCC::PropagateDirectory</name> <name>OCC::PropagateDirectory</name>
<message> <message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1227"/> <location filename="../src/libsync/owncloudpropagator.cpp" line="1284"/>
<source>could not delete file %1 from local DB</source> <source>could not delete file %1 from local DB</source>
<translation> %1</translation> <translation> %1</translation>
</message> </message>
@ -3526,7 +3681,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message> </message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="512"/> <location filename="../src/libsync/propagatedownload.cpp" line="512"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1278"/> <location filename="../src/libsync/propagatedownload.cpp" line="1293"/>
<source>Could not delete file record %1 from local DB</source> <source>Could not delete file record %1 from local DB</source>
<translation> %1</translation> <translation> %1</translation>
</message> </message>
@ -3577,6 +3732,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 has invalid modified time reported by server. Do not save it.</source> <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation> %1 </translation> <translation> %1 </translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatedownload.cpp" line="1269"/> <location filename="../src/libsync/propagatedownload.cpp" line="1269"/>
<source>Error updating metadata: %1</source> <source>Error updating metadata: %1</source>
@ -3613,6 +3773,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Attention, possible case sensitivity clash with %1</source> <source>Attention, possible case sensitivity clash with %1</source>
<translation>%1 </translation> <translation>%1 </translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Could not create folder %1</source> <source>Could not create folder %1</source>
@ -3649,6 +3814,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>File %1 cannot be renamed to %2 because of a local file name clash</source> <source>File %1 cannot be renamed to %2 because of a local file name clash</source>
<translation> %1 %2</translation> <translation> %1 %2</translation>
</message> </message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="310"/> <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
@ -4117,7 +4287,9 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<source>Could not encrypt the following folder: &quot;%1&quot;. <source>Could not encrypt the following folder: &quot;%1&quot;.
Server replied with error: %2</source> Server replied with error: %2</source>
<translation type="unfinished"/> <translation>%1
%2</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="555"/> <location filename="../src/gui/socketapi/socketapi.cpp" line="555"/>
@ -4498,7 +4670,7 @@ Server replied with error: %2</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
<message> <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/> <location filename="../src/libsync/syncengine.cpp" line="409"/>
<source>Could not set file record to local DB: %1</source> <source>Could not set file record to local DB: %1</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
@ -4730,6 +4902,12 @@ Server replied with error: %2</source>
<source>Retry all uploads</source> <source>Retry all uploads</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>OCC::UserModel</name> <name>OCC::UserModel</name>
@ -5354,17 +5532,17 @@ Server replied with error: %2</source>
<message> <message>
<location filename="../src/gui/filedetails/ShareDelegate.qml" line="159"/> <location filename="../src/gui/filedetails/ShareDelegate.qml" line="159"/>
<source>Create a new share link</source> <source>Create a new share link</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/filedetails/ShareDelegate.qml" line="179"/> <location filename="../src/gui/filedetails/ShareDelegate.qml" line="179"/>
<source>Copy share link location</source> <source>Copy share link location</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/filedetails/ShareDelegate.qml" line="208"/> <location filename="../src/gui/filedetails/ShareDelegate.qml" line="208"/>
<source>Share options</source> <source>Share options</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
</context> </context>
<context> <context>
@ -5372,57 +5550,57 @@ Server replied with error: %2</source>
<message> <message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="87"/> <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="87"/>
<source>An error occurred setting the share password.</source> <source>An error occurred setting the share password.</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="220"/> <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="220"/>
<source>Edit share</source> <source>Edit share</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="237"/> <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="237"/>
<source>Dismiss</source> <source>Dismiss</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="296"/> <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="296"/>
<source>Share label</source> <source>Share label</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="329"/> <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="329"/>
<source>Allow editing</source> <source>Allow editing</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="357"/> <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="357"/>
<source>Password protect</source> <source>Password protect</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="462"/> <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="462"/>
<source>Set expiration date</source> <source>Set expiration date</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="653"/> <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="653"/>
<source>Note to recipient</source> <source>Note to recipient</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="721"/> <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="721"/>
<source>Unshare</source> <source>Unshare</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="738"/> <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="738"/>
<source>Add another link</source> <source>Add another link</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="769"/> <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="769"/>
<source>Copy share link</source> <source>Copy share link</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
</context> </context>
<context> <context>
@ -5527,7 +5705,7 @@ Server replied with error: %2</source>
<message> <message>
<location filename="../src/gui/tray/UnifiedSearchResultNothingFound.qml" line="26"/> <location filename="../src/gui/tray/UnifiedSearchResultNothingFound.qml" line="26"/>
<source>No results for</source> <source>No results for</source>
<translation type="unfinished"/> <translation></translation>
</message> </message>
</context> </context>
<context> <context>
@ -5535,7 +5713,7 @@ Server replied with error: %2</source>
<message> <message>
<location filename="../src/gui/tray/UnifiedSearchResultSectionItem.qml" line="20"/> <location filename="../src/gui/tray/UnifiedSearchResultSectionItem.qml" line="20"/>
<source>Search results section %1</source> <source>Search results section %1</source>
<translation type="unfinished"/> <translation> %1</translation>
</message> </message>
</context> </context>
<context> <context>
@ -5915,6 +6093,11 @@ Server replied with error: %2</source>
<source>Server version downloaded, copied changed local file into conflict file</source> <source>Server version downloaded, copied changed local file into conflict file</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
</message>
<message> <message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source> <source>Deleted</source>