From: Nextcloud bot Date: Mon, 30 Jan 2023 10:24:32 +0000 (+0000) Subject: Fix(l10n): 🔠 Update translations from Transifex X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~22 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2a64fc782b90956975b6e94f1dfc0d7c8351abbd;p=nextcloud-desktop.git Fix(l10n): 🔠 Update translations from Transifex Signed-off-by: Nextcloud bot --- diff --git a/translations/client_bg.ts b/translations/client_bg.ts index 7e065c70b..fb52e6305 100644 --- a/translations/client_bg.ts +++ b/translations/client_bg.ts @@ -1045,6 +1045,156 @@ This action will abort any currently running synchronization. Възстановяването е неуспешно: % 1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3387,6 +3537,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. Конфликт: Изтеглена е версия на сървъра, а локалното копие е преименувано и не е качено. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3428,7 +3583,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss Не може да се синхронизира поради невалиден час на модификация - + Error while deleting file record %1 from the database Грешка при изтриване на запис на файл %1 от базата данни @@ -3486,7 +3641,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB не можа да изтрие файл %1 от локалната БД /база данни/ @@ -3526,7 +3681,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB Не можа да се изтрие запис на файл %1 от локалната БД @@ -3577,6 +3732,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. Файл %1 има невалиден час на промяна, отчетен от сървъра. Не го записвайте. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3613,6 +3773,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Внимание, възможен сблъсък с чувствителността към големи и малки букви с% 1  + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3649,6 +3814,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash Файл % 1 не може да бъде преименуван на %2 поради сблъсък с името на локален файл! + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4500,7 +4670,7 @@ Server replied with error: %2 Невъзможност да се актуализират метаданните на файла: % 1 - + Could not set file record to local DB: %1 Не може да се зададе запис на файл в локалната БД: %1 @@ -4732,6 +4902,12 @@ Server replied with error: %2 Retry all uploads Нов опит на всички качвания + + + + Resolve conflict + + OCC::UserModel @@ -5917,6 +6093,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Изтеглена е версия на сървъра, копирана е, променен локален файл в конфликтен файл + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_br.ts b/translations/client_br.ts index 04997abca..aba5d7869 100644 --- a/translations/client_br.ts +++ b/translations/client_br.ts @@ -1040,6 +1040,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3363,6 +3513,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3404,7 +3559,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3462,7 +3617,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3502,7 +3657,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3553,6 +3708,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3589,6 +3749,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Diwallit, stourmoù a vo marteze gant %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3625,6 +3790,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4474,7 +4644,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4706,6 +4876,12 @@ Server replied with error: %2 Retry all uploads Klask en dro pep pellkasadenn + + + + Resolve conflict + + OCC::UserModel @@ -5891,6 +6067,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Stumm servijour pellkarget, eilet eo bet ar restroù cheñchet er restr stourm + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_ca.ts b/translations/client_ca.ts index 42441b00b..cb4e3e80d 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -1044,6 +1044,156 @@ Aquesta acció anul·larà qualsevol sincronització en execució. S'ha produït un error en la restauració: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3363,6 +3513,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. Conflicte: s'ha baixat la versió del servidor, s'ha canviat el nom de la còpia local i no s'ha pujat. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3404,7 +3559,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3462,7 +3617,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3502,7 +3657,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3553,6 +3708,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3589,6 +3749,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Atenció, possible conflicte entre majúscules i minúscules amb %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3625,6 +3790,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4474,7 +4644,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4706,6 +4876,12 @@ Server replied with error: %2 Retry all uploads Torna a intentar totes les pujades + + + + Resolve conflict + + OCC::UserModel @@ -5891,6 +6067,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file S'ha baixat la versió del servidor i s'ha copiat el fitxer local modificat en un fitxer en conflicte + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 015a9bef6..9b0629c74 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -442,7 +442,7 @@ Disable encryption - + Vypnout Å¡ifrování @@ -634,17 +634,17 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci. Disable end-to-end encryption - + Vypnout Å¡ifrování mezi koncovými body Disable end-to-end encryption for %1? - + Vypnout Å¡ifrování mezi koncovými body pro %1? Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server. - + Odebrání Å¡ifrování mezi koncovými body odebere lokálně synchronizované soubory, které jsou Å¡ifrované.<br>ZaÅ¡ifrované soubory zůstanou na serveru. @@ -1045,6 +1045,156 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.Obnovení se nezdařilo: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -1867,7 +2017,7 @@ Pokud to byla pouze chyba a chcete si tyto soubory ponechat, budou ze serveru zn Could not decrypt! - + Nepodařilo se rozÅ¡ifrovat! @@ -2612,7 +2762,7 @@ Položky u kterých je umožněno mazání budou smazány, pokud brání tomu, a <p>Copyright 2017-2023 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p> - + <p>Copyright 2017-2023 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p> @@ -3386,6 +3536,11 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros Conflict: Server version downloaded, local copy renamed and not uploaded. Konflikt: Stažena verze ze serveru, místní kopie přejmenována a nenahrána. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3427,7 +3582,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros Není možné provést synchronizaci z důvodu neplatného času změny - + Error while deleting file record %1 from the database Chyba při mazání záznamu o souboru %1 z databáze @@ -3485,7 +3640,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros OCC::PropagateDirectory - + could not delete file %1 from local DB nepodařilo se smazat soubor %1 lokální databáze @@ -3525,7 +3680,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros - + Could not delete file record %1 from local DB Nepodařilo se smazat záznam o souboru %1 z lokální databáze @@ -3576,6 +3731,11 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros File %1 has invalid modified time reported by server. Do not save it. Soubor %1 nemá platný čas změny, hlášený na server. Neukládat ho. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3612,6 +3772,11 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros Attention, possible case sensitivity clash with %1 Pozor, možná kolize s %1 z důvodu rozliÅ¡ování malých/VELKÝCH písmen + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3648,6 +3813,11 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros File %1 cannot be renamed to %2 because of a local file name clash Soubor %1 nemohl být přejmenován na %2 z důvodu kolize názvu s místním souborem + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4499,7 +4669,7 @@ Server odpověděl chybou: %2 Nedaří se aktualizovat metadata souboru: %1 - + Could not set file record to local DB: %1 Nepodařilo se nastavit záznam ohledně souboru na lokální databázi: %1 @@ -4731,6 +4901,12 @@ Server odpověděl chybou: %2 Retry all uploads Znovu spustit vÅ¡echna nahrávání + + + + Resolve conflict + + OCC::UserModel @@ -5916,6 +6092,11 @@ Server odpověděl chybou: %2 Server version downloaded, copied changed local file into conflict file Stažena verze ze serveru, změněný místní soubor zkopírován do konfliktního souboru + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_da.ts b/translations/client_da.ts index 492a1689c..b02bfea1a 100644 --- a/translations/client_da.ts +++ b/translations/client_da.ts @@ -1044,6 +1044,156 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3368,6 +3518,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3409,7 +3564,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3467,7 +3622,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3507,7 +3662,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3558,6 +3713,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3594,6 +3754,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Advarsel, mulig stort/lille bogstavskonflikt med %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3630,6 +3795,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4479,7 +4649,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4711,6 +4881,12 @@ Server replied with error: %2 Retry all uploads Prøv alle uploads igen + + + + Resolve conflict + + OCC::UserModel @@ -5896,6 +6072,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Versionen pÃ¥ serveren hentet, kopierede den ændrede lokale fil til filen med konflikt + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_de.ts b/translations/client_de.ts index 11b157341..ce1249f33 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -442,7 +442,7 @@ Disable encryption - + Verschlüsselung deaktivieren @@ -633,17 +633,17 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab. Disable end-to-end encryption - + Ende-zu-Ende-Verschlüsselung deaktivieren Disable end-to-end encryption for %1? - + Ende-zu-Ende-Verschlüsselung für %1 deaktivieren? Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server. - + Durch das Entfernen der Ende-zu-Ende-Verschlüsselung werden lokal synchronisierte Dateien entfernt, die verschlüsselt sind.<br>Verschlüsselte Dateien verbleiben auf dem Server. @@ -1044,6 +1044,156 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab. Wiederherstellung fehlgeschlagen: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -1867,7 +2017,7 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide Could not decrypt! - + Konnte nicht entschlüsseln! @@ -2612,7 +2762,7 @@ Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn diese das Lösch <p>Copyright 2017-2023 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p> - + <p>Copyright 2017-2023 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p> @@ -3386,6 +3536,11 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver Conflict: Server version downloaded, local copy renamed and not uploaded. Konflikt: Serverversion heruntergeladen, lokale Kopie umbenannt und nicht hochgeladen. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3427,7 +3582,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver Synchronisierung wegen ungültiger Änderungszeit nicht möglich - + Error while deleting file record %1 from the database Fehler beim Löschen des Dateisatzes %1 aus der Datenbank @@ -3485,7 +3640,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver OCC::PropagateDirectory - + could not delete file %1 from local DB Datei %1 konnte nicht aus lokaler Datenbank gelöscht werden @@ -3525,7 +3680,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver - + Could not delete file record %1 from local DB Der Dateidatensatz %1 konnte nicht aus der lokalen Datenbank gelöscht werden @@ -3576,6 +3731,11 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver File %1 has invalid modified time reported by server. Do not save it. Datei %1 hat eine ungültige Änderungszeit, die vom Server gemeldet wurde. Speichern Sie sie nicht. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3612,6 +3772,11 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver Attention, possible case sensitivity clash with %1 Achtung, es könnte ein Problem mit der Groß-/Kleinschreibung für %1 auftreten + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3648,6 +3813,11 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver File %1 cannot be renamed to %2 because of a local file name clash Die Datei %1 kann aufgrund eines Konfliktes mit einem lokalen Dateinamen nicht in %2 umbenannt werden + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4499,7 +4669,7 @@ Server antwortete mit folgendem Fehler: %2 Die Metadaten der Datei konnten nicht aktualisiert werden: %1 - + Could not set file record to local DB: %1 Dateidatensatz konnte nicht auf lokale DB gesetzt werden: %1 @@ -4731,6 +4901,12 @@ Server antwortete mit folgendem Fehler: %2 Retry all uploads Alle Uploads neu starten + + + + Resolve conflict + + OCC::UserModel @@ -5916,6 +6092,11 @@ Server antwortete mit folgendem Fehler: %2 Server version downloaded, copied changed local file into conflict file Serverversion heruntergeladen. Die bearbeitete lokale Datei wurde in eine Konfliktdatei kopiert. + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_el.ts b/translations/client_el.ts index 652105e4b..9b18bc421 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -442,7 +442,7 @@ Disable encryption - + Απενεργοποίηση κρυπτογράφησης @@ -629,7 +629,7 @@ This action will abort any currently running synchronization. Disable end-to-end encryption - + Απενεργοποίηση κρυπτογράφησης από άκρο σε άκρο @@ -1040,6 +1040,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3371,6 +3521,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. Διένεξη: Λήψη έκδοσης διακομιστή, μετονομασία τοπικού αντιγράφου και μη μεταφόρτωση. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3412,7 +3567,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3470,7 +3625,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3510,7 +3665,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3561,6 +3716,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3597,6 +3757,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Προσοχή, πιθανή διένεξη κεφαλαίων-πεζών γραμμάτων με το %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3633,6 +3798,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -3760,7 +3930,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss Failed to upload encrypted file. - + Η μεταμόρφωση του κρυπτογραφημένου αρχείου απέτυχε. @@ -4482,7 +4652,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4714,6 +4884,12 @@ Server replied with error: %2 Retry all uploads Επανάληψη όλων των μεταφορτώσεων + + + + Resolve conflict + + OCC::UserModel @@ -5899,6 +6075,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Η έκδοση του διακομιστή κατέβηκε, η αντιγραφή άλλαξε το τοπικό αρχείο σε συγκρουόμενο αρχείο + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index c1f9faffe..702c97a1a 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -442,7 +442,7 @@ Disable encryption - + Disable encryption @@ -634,17 +634,17 @@ This action will abort any currently running synchronization. Disable end-to-end encryption - + Disable end-to-end encryption Disable end-to-end encryption for %1? - + Disable end-to-end encryption for %1? Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server. - + Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server. @@ -1045,6 +1045,156 @@ This action will abort any currently running synchronization. Restoration failed: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -1868,7 +2018,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Could not decrypt! - + Could not decrypt! @@ -2613,7 +2763,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <p>Copyright 2017-2023 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p> - + <p>Copyright 2017-2023 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p> @@ -3387,6 +3537,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3428,7 +3583,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss Cannot sync due to invalid modification time - + Error while deleting file record %1 from the database Error while deleting file record %1 from the database @@ -3486,7 +3641,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB could not delete file %1 from local DB @@ -3526,7 +3681,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB Could not delete file record %1 from local DB @@ -3577,6 +3732,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3613,6 +3773,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Attention, possible case sensitivity clash with %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3649,6 +3814,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4500,7 +4670,7 @@ Server replied with error: %2 Could not update file metadata: %1 - + Could not set file record to local DB: %1 Could not set file record to local DB: %1 @@ -4732,6 +4902,12 @@ Server replied with error: %2 Retry all uploads Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5917,6 +6093,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Server version downloaded, copied changed local file into conflict file + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_eo.ts b/translations/client_eo.ts index 1eaf5d28e..9975bb73d 100644 --- a/translations/client_eo.ts +++ b/translations/client_eo.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. RestaÅ­rado malsukcesis: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3362,6 +3512,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3403,7 +3558,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3461,7 +3616,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3501,7 +3656,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3552,6 +3707,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3588,6 +3748,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Atentu: ebla usklecodistinga konflikto kun %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3624,6 +3789,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4472,7 +4642,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4704,6 +4874,12 @@ Server replied with error: %2 Retry all uploads Reprovi ĉiujn alŝutojn + + + + Resolve conflict + + OCC::UserModel @@ -5889,6 +6065,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Servila versio elŝutita; la ŝanĝita loka dosiero estis kopiita en konfliktan dosieron + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_es.ts b/translations/client_es.ts index 8d15bae8f..2e0266267 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -31,7 +31,7 @@ Open file details - Abrir detalles de archivo + Abrir detalles del archivo @@ -172,7 +172,7 @@ Opening file for local editing - Abriendo archivo para edición local + Abriendo archivo para editarlo en local @@ -412,7 +412,7 @@ End-to-end Encryption with Virtual Files - Cifrado de extremo a extremo con Archivos virtuales + Cifrado de extremo a extremo con Archivos Virtuales @@ -442,7 +442,7 @@ Disable encryption - + Deshabilitar cifrado @@ -634,17 +634,17 @@ Además, esta acción interrumpirá cualquier sincronización en curso. Disable end-to-end encryption - + Deshabilitar cifrado de extremo a extremo Disable end-to-end encryption for %1? - + Deshabilitar cifrado de extremo a extremo para %1? Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server. - + Quitar el cifrado de extremo a extremo borrará los archivos sincronizados localmente que se encuentran encriptados.<br>Los archivos encriptados se mantendrán en el servidor. @@ -1045,6 +1045,156 @@ Además, esta acción interrumpirá cualquier sincronización en curso.Fallo al restaurar: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -1869,7 +2019,7 @@ Si esto ha sido un accidente, y decides mantener tus archivos, serán re-sincron Could not decrypt! - + ¡No fue posible desencriptar! @@ -2614,7 +2764,7 @@ Los elementos que se permite su borrado se eliminarán si impiden que un directo <p>Copyright 2017-2023 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p> - + <p>Copyright 2017-2023 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p> @@ -3388,6 +3538,11 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c Conflict: Server version downloaded, local copy renamed and not uploaded. Conflicto: Versión del servidor descargada, la copia local ha sido renombrada pero no se ha podido subir. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3429,7 +3584,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c No se puede sincronizar debido a una hora de modificación no válida - + Error while deleting file record %1 from the database Error mientras se borraba el registro de archivo %1 de la base de datos @@ -3487,7 +3642,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c OCC::PropagateDirectory - + could not delete file %1 from local DB no fue posible borrar el archivo %1 de la base de datos local @@ -3527,7 +3682,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c - + Could not delete file record %1 from local DB No fue posible borrar el registro del archivo %1 de la base de datos local @@ -3578,6 +3733,11 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c File %1 has invalid modified time reported by server. Do not save it. El servidor informa que el archivo %1 tiene una hora de modificación no válida. No lo guardes. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3614,6 +3774,11 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c Attention, possible case sensitivity clash with %1 Atención, posible error de mayúsculas/minúsculas en %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3650,6 +3815,11 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c File %1 cannot be renamed to %2 because of a local file name clash El archivo %1 no se pudo renombrar a %2 a causa de un conflicto con el nombre de un archivo local + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4501,7 +4671,7 @@ El servidor respondió con el error: %2 No se pudo actualizar los metadatos del archivo: %1 - + Could not set file record to local DB: %1 No fue posible establecer el registro del archivo a la base de datos local: %1 @@ -4733,6 +4903,12 @@ El servidor respondió con el error: %2 Retry all uploads Reintentar todas las subidas + + + + Resolve conflict + + OCC::UserModel @@ -5918,6 +6094,11 @@ El servidor respondió con el error: %2 Server version downloaded, copied changed local file into conflict file Versión del servidor descargada, se ha copiado el fichero local cambiado al fichero en conflicto + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts index c14e4fb90..b8688c7d1 100644 --- a/translations/client_es_CL.ts +++ b/translations/client_es_CL.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4465,7 +4635,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4697,6 +4867,12 @@ Server replied with error: %2 Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5882,6 +6058,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts index ff33b4632..0fdfa784b 100644 --- a/translations/client_es_CO.ts +++ b/translations/client_es_CO.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4465,7 +4635,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4697,6 +4867,12 @@ Server replied with error: %2 Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5882,6 +6058,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts index bcbd5a6c9..6434086d4 100644 --- a/translations/client_es_CR.ts +++ b/translations/client_es_CR.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4465,7 +4635,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4697,6 +4867,12 @@ Server replied with error: %2 Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5882,6 +6058,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts index 143694718..ba894a819 100644 --- a/translations/client_es_DO.ts +++ b/translations/client_es_DO.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4465,7 +4635,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4697,6 +4867,12 @@ Server replied with error: %2 Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5882,6 +6058,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts index 02f17107b..aea21f8c1 100644 --- a/translations/client_es_EC.ts +++ b/translations/client_es_EC.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4465,7 +4635,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4697,6 +4867,12 @@ Server replied with error: %2 Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5882,6 +6058,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts index 65542b647..93c5e171a 100644 --- a/translations/client_es_GT.ts +++ b/translations/client_es_GT.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4465,7 +4635,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4697,6 +4867,12 @@ Server replied with error: %2 Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5882,6 +6058,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts index b263466d1..90e1714c9 100644 --- a/translations/client_es_HN.ts +++ b/translations/client_es_HN.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4465,7 +4635,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4697,6 +4867,12 @@ Server replied with error: %2 Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5882,6 +6058,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts index acf590e6e..409304eb6 100644 --- a/translations/client_es_MX.ts +++ b/translations/client_es_MX.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4465,7 +4635,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4697,6 +4867,12 @@ Server replied with error: %2 Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5882,6 +6058,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts index 159a8d48c..04a50aa9c 100644 --- a/translations/client_es_SV.ts +++ b/translations/client_es_SV.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Atención, hay un posible conflicto con %1 por mayúsculas y minúsculas + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4465,7 +4635,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4697,6 +4867,12 @@ Server replied with error: %2 Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5882,6 +6058,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Versión del servidor descargada, se copío el archivo local cambiado a un archivo en conflicto + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_et.ts b/translations/client_et.ts index 25832096d..81cb7136b 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3352,6 +3502,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3393,7 +3548,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3451,7 +3606,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3491,7 +3646,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3542,6 +3697,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3578,6 +3738,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Tähelepanu, võimalik tõusutundliku nime konflikt %1-ga + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3614,6 +3779,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4463,7 +4633,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4695,6 +4865,12 @@ Server replied with error: %2 Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5880,6 +6056,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_eu.ts b/translations/client_eu.ts index e51761b1a..bd4fa75ca 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -1045,6 +1045,156 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du. Berrezartzeak huts egin du: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3387,6 +3537,11 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di Conflict: Server version downloaded, local copy renamed and not uploaded. Gatazka: zerbitzari bertsioa deskargatu da, kopia lokala berrizendatua eta ez kargatuta. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3428,7 +3583,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di Ezin da sinkronizatu aldaketa-ordu baliogabea delako - + Error while deleting file record %1 from the database Errorea %1 fitxategi erregistroa datu-basetik ezabatzean @@ -3486,7 +3641,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di OCC::PropagateDirectory - + could not delete file %1 from local DB Ezin izan da %1 fitxategia datu-base lokaletik ezabatu @@ -3526,7 +3681,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di - + Could not delete file record %1 from local DB Ezin izan da %1 fitxategiaren erregistroa datu-base lokaletik ezabatu @@ -3577,6 +3732,11 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di File %1 has invalid modified time reported by server. Do not save it. % 1 fitxategiak zerbitzariak jakinarazitako aldaketa-ordu baliogabea du. Ez gorde. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3613,6 +3773,11 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di Attention, possible case sensitivity clash with %1 Kontuz, baliteke maiuskulekin izen gatazka egotea %1ekin + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3649,6 +3814,11 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di File %1 cannot be renamed to %2 because of a local file name clash %1 fitxategiari ezin zaio %2 izena eman fitxategi lokal baten izenarekin talkagatik. + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4500,7 +4670,7 @@ Zerbitzariak errorearekin erantzun du: %2 Ezin izan dira fitxategiaren metadatuak eguneratu: %1 - + Could not set file record to local DB: %1 Ezin izan da fitxategiaren erregistroa datu-base lokalean ezarri: %1 @@ -4732,6 +4902,12 @@ Zerbitzariak errorearekin erantzun du: %2 Retry all uploads Saiatu dena berriro kargatzen + + + + Resolve conflict + + OCC::UserModel @@ -5917,6 +6093,11 @@ Zerbitzariak errorearekin erantzun du: %2 Server version downloaded, copied changed local file into conflict file Zerbitzari bertsioa deskargatu da, kopiaturikoak fitxategi lokala fitxategi gatazkatsu bihurtu du + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_fa.ts b/translations/client_fa.ts index 20e19afda..598e15c43 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4464,7 +4634,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4696,6 +4866,12 @@ Server replied with error: %2 Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5881,6 +6057,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file نسخه سرور دانلود شد، پرونده محلی تغییر یافته به پرونده ناسازگار کپی شد + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_fi.ts b/translations/client_fi.ts index 5ddeb4a3d..243234597 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -31,7 +31,7 @@ Open file details - + Avaa tiedoston yksityiskohdat @@ -172,7 +172,7 @@ Opening file for local editing - + Avataan tiedosto paikallista muokkausta varten @@ -196,7 +196,7 @@ Dismiss - + Hylkää @@ -206,7 +206,7 @@ Sharing - + Jakaminen @@ -442,7 +442,7 @@ Disable encryption - + Poista salaus käytöstä @@ -457,7 +457,7 @@ End-to-end encryption has been enabled for this account - + Päästä päähän -salaus on käytössä tällä tilillä @@ -632,7 +632,7 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit. Disable end-to-end encryption - + Poista päästä päähän -salaus käytöstä @@ -768,7 +768,7 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit. Set up encryption - + Aseta salaus @@ -1043,6 +1043,156 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit. Palautus epäonnistui: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -1294,7 +1444,7 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit. Please try again. - + Yritä uudelleen. @@ -1339,12 +1489,12 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit. Could not open %1 - + Ei voitu avata %1 File %1 already locked. - + Tiedosto %1 on jo lukittu. @@ -1360,7 +1510,7 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit. File %1 could not be locked. - + Tiedostoa %1 ei voitu lukita. @@ -3248,7 +3398,7 @@ Note that using any logging command line options will override this setting. Cancel - + Peruuta @@ -3365,6 +3515,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. Konflikti: Palvelimen versio ladattu, paikallinen kopio on nimetty uudelleen mutta ei ladattu palvelimelle. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3406,7 +3561,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss Ei voida synkronoida virheellisen muokkausajan vuoksi - + Error while deleting file record %1 from the database @@ -3464,7 +3619,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3504,7 +3659,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3555,6 +3710,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3591,6 +3751,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3627,6 +3792,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -3988,7 +4158,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss Internal link - + Sisäinen linkki @@ -4179,7 +4349,7 @@ Server replied with error: %2 Encrypt - + Salaa @@ -4476,7 +4646,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4708,6 +4878,12 @@ Server replied with error: %2 Retry all uploads Yritä uudelleen kaikkia lähetyksiä + + + + Resolve conflict + + OCC::UserModel @@ -5893,6 +6069,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Palvelimen versio ladattu, paikallinen muutettu tiedosto kopioitu konfliktitiedostoksi + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 501eeeabd..8d54b7612 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -1043,6 +1043,156 @@ Vous prenez vos propres risques. Échec de la restauration : %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3386,6 +3536,11 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' Conflict: Server version downloaded, local copy renamed and not uploaded. Conflit : La version du serveur a été téléchargée, la version locale renommée et non téléversée. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3427,7 +3582,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' Impossible de synchroniser à cause d'une date de modification invalide - + Error while deleting file record %1 from the database Erreur à la suppression de l'enregistrement du fichier %1 de la base de données @@ -3485,7 +3640,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' OCC::PropagateDirectory - + could not delete file %1 from local DB Impossible de supprimer le fichier %1 de la base de données locale @@ -3525,7 +3680,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' - + Could not delete file record %1 from local DB Impossible de supprimer l'enregistrement du fichier %1 depuis la base de données locale @@ -3576,6 +3731,11 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' File %1 has invalid modified time reported by server. Do not save it. Le fichier %1 présente une date de modification invalide sur le serveur. Enregistrement impossible. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3612,6 +3772,11 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' Attention, possible case sensitivity clash with %1 Attention, collision possible avec %1 à cause de la casse + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3648,6 +3813,11 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' File %1 cannot be renamed to %2 because of a local file name clash Le fichier %1 ne peut pas être renommé en %2 à cause d'un conflit local de nom de fichier + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4499,7 +4669,7 @@ Le serveur a répondu avec l'erreur : %2 Impossible de mettre à jour les métadonnées du fichier : %1 - + Could not set file record to local DB: %1 Impossible de définir l'enregistrement du fichier dans la base de données locale : %1 @@ -4731,6 +4901,12 @@ Le serveur a répondu avec l'erreur : %2 Retry all uploads Relancer tous les envois + + + + Resolve conflict + + OCC::UserModel @@ -5916,6 +6092,11 @@ Le serveur a répondu avec l'erreur : %2 Server version downloaded, copied changed local file into conflict file La version du serveur est téléchargée, les changements locaux ont été copiés dans un fichier conflit. + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_gl.ts b/translations/client_gl.ts index c08b13efe..ffdeb55ac 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -1044,6 +1044,156 @@ Esta acción interromperá calquera sincronización que estea a executarse actua Produciuse un fallo na restauración: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3381,6 +3531,11 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe Conflict: Server version downloaded, local copy renamed and not uploaded. Conflito: Versión do servidor descargada, a copia local cambiou o nome e non se cargou. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3422,7 +3577,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe - + Error while deleting file record %1 from the database @@ -3480,7 +3635,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3520,7 +3675,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe - + Could not delete file record %1 from local DB @@ -3571,6 +3726,11 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3607,6 +3767,11 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe Attention, possible case sensitivity clash with %1 Atención, posíbel colisión entre maiúsculas e minúsculas con %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3643,6 +3808,11 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4492,7 +4662,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4724,6 +4894,12 @@ Server replied with error: %2 Retry all uploads Tentar de novo todos os envíos + + + + Resolve conflict + + OCC::UserModel @@ -5909,6 +6085,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Versión do servidor descargada, copiouse o cambio local do ficheiro dentro do ficheiro en conflito + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_he.ts b/translations/client_he.ts index b72de8544..4fabee691 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -1040,6 +1040,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3359,6 +3509,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3400,7 +3555,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3458,7 +3613,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3498,7 +3653,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3549,6 +3704,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3585,6 +3745,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 לתשומת לבך, כנראה שיש סתירה של אותיות רישיות עם %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3621,6 +3786,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4470,7 +4640,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4702,6 +4872,12 @@ Server replied with error: %2 Retry all uploads לנסות את כל ההורדות מחדש + + + + Resolve conflict + + OCC::UserModel @@ -5887,6 +6063,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file הגרסה מהשרת התקבלה, והקובץ המקומי שהשתנה הועתק לקובץ סתירה + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_hr.ts b/translations/client_hr.ts index aca7cd05d..4c8df2cac 100644 --- a/translations/client_hr.ts +++ b/translations/client_hr.ts @@ -1044,6 +1044,156 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3386,6 +3536,11 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav Conflict: Server version downloaded, local copy renamed and not uploaded. Nepodudaranje: preuzeta inačica poslužitelja, lokalna kopija preimenovana i nije otpremljena. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3427,7 +3582,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav - + Error while deleting file record %1 from the database @@ -3485,7 +3640,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3525,7 +3680,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav - + Could not delete file record %1 from local DB @@ -3576,6 +3731,11 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3612,6 +3772,11 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav Attention, possible case sensitivity clash with %1 Pažnja, moguće nepodudaranje velikih i malih slova s %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3648,6 +3813,11 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav File %1 cannot be renamed to %2 because of a local file name clash Datoteka %1 ne može se preimenovati u %2 zbog nepodudaranja naziva lokalne datoteke + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4497,7 +4667,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4729,6 +4899,12 @@ Server replied with error: %2 Retry all uploads Ponovno pokreni sve otpreme + + + + Resolve conflict + + OCC::UserModel @@ -5914,6 +6090,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Preuzeta je inačica poslužitelja, promijenjena lokalna datoteka kopirana u datoteku nepodudaranja + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_hu.ts b/translations/client_hu.ts index c4705d1c5..b25b9d5ae 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -1045,6 +1045,156 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást. Helyreállítás sikertelen: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3388,6 +3538,11 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek Conflict: Server version downloaded, local copy renamed and not uploaded. Ütközés: A kiszolgáló verziója letöltve, a helyi példány átnevezve és nem lett feltöltve. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3429,7 +3584,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek Az érvénytelen módosítási idő miatt nem lehet szinkronizálni - + Error while deleting file record %1 from the database Hiba történt a(z) %1 fájlrekord adatbázisból törlése során @@ -3487,7 +3642,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek OCC::PropagateDirectory - + could not delete file %1 from local DB a(z) %1 fájl törlése a helyi adatbázisból nem sikerült @@ -3527,7 +3682,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek - + Could not delete file record %1 from local DB A(z) %1 fájlrekord törlése a helyi adatbázisból nem sikerült @@ -3578,6 +3733,11 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek File %1 has invalid modified time reported by server. Do not save it. A(z) %1 fájl módosítási ideje a kiszolgáló szerint érvénytelen. Ne mentse el. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3614,6 +3774,11 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek Attention, possible case sensitivity clash with %1 Figyelem, lehetséges kis- és nagybetűk miatti ütközés ennél: %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3650,6 +3815,11 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek File %1 cannot be renamed to %2 because of a local file name clash A(z) %1 fájl egy helyi fájl névütközése miatt nem nevezhető ár erre: %2, + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4501,7 +4671,7 @@ A kiszolgáló hibával válaszolt: %2 Nem sikerült frissíteni a fájl metaadatait: %1 - + Could not set file record to local DB: %1 A fájlrekord beállítása a helyi adatbázisban nem sikerült: %1 @@ -4733,6 +4903,12 @@ A kiszolgáló hibával válaszolt: %2 Retry all uploads Összes feltöltés újrapróbálása + + + + Resolve conflict + + OCC::UserModel @@ -5918,6 +6094,11 @@ A kiszolgáló hibával válaszolt: %2 Server version downloaded, copied changed local file into conflict file A kiszolgáló verziója letöltve, a módosított helyi fájl ütközésfájlba másolva + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_id.ts b/translations/client_id.ts index f8d015144..b75f0368a 100644 --- a/translations/client_id.ts +++ b/translations/client_id.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3360,6 +3510,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3401,7 +3556,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3459,7 +3614,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3499,7 +3654,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3550,6 +3705,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3586,6 +3746,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3622,6 +3787,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4469,7 +4639,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4701,6 +4871,12 @@ Server replied with error: %2 Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5886,6 +6062,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_is.ts b/translations/client_is.ts index 2ce6390a5..65449a8b5 100644 --- a/translations/client_is.ts +++ b/translations/client_is.ts @@ -1044,6 +1044,156 @@ gagnageymslur: + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3363,6 +3513,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3404,7 +3559,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3462,7 +3617,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3502,7 +3657,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3553,6 +3708,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3589,6 +3749,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3625,6 +3790,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4474,7 +4644,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4706,6 +4876,12 @@ Server replied with error: %2 Retry all uploads Prófa aftur allar innsendingar + + + + Resolve conflict + + OCC::UserModel @@ -5893,6 +6069,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Sótti útgáfu þjóns, afritaði breytta staðværa skrá yfir í árekstraskrá + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_it.ts b/translations/client_it.ts index f209e1336..26cad0e80 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -1044,6 +1044,156 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione Ripristini falliti: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3377,6 +3527,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. Conflitto: versione del server scaricata, copia locale rinominata e non caricata. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3418,7 +3573,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss Impossibile sincronizzare a causa di un orario di modifica non valido - + Error while deleting file record %1 from the database Errore nella rilevazione del record del file %1 dal database @@ -3476,7 +3631,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB impossibile eliminare il file %1 dal DB locale @@ -3516,7 +3671,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB Impossibile eliminare il record del file %1 dal DB locale @@ -3567,6 +3722,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. Il file %1 ha un orario di modifica non valido segnalato dal server. Non salvarlo. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3603,6 +3763,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Attenzione, possibile conflitto relativo all'uso di maiuscole e minuscole con %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3639,6 +3804,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash Il file %1 non può essere rinominato in %2 per un conflitto con il nome di un file locale + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4488,7 +4658,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 Impossibile impostare il record del file nel DB locale: %1 @@ -4720,6 +4890,12 @@ Server replied with error: %2 Retry all uploads Riprova tutti i caricamenti + + + + Resolve conflict + + OCC::UserModel @@ -5905,6 +6081,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Versione del server scaricata, il file locale modificato è stato copiato come file di conflitto + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_ja.ts b/translations/client_ja.ts index eb9092920..04c54e428 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -1044,6 +1044,156 @@ This action will abort any currently running synchronization. 復元に失敗しました: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3385,6 +3535,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. コンフリクト: サーバーのバージョンがダウンロードされて、ローカルのコピーはファイル名を変更しアップロードしません。 + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3426,7 +3581,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss 修正日時が無効なため同期できません - + Error while deleting file record %1 from the database @@ -3484,7 +3639,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3524,7 +3679,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3575,6 +3730,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. ファイル %1 のサーバから報告された修正日時が無効です。保存しないでください。 + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3611,6 +3771,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 注意: %1 で大文字小文字が競合している可能性 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3647,6 +3812,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash ローカルファイル名が衝突しているため、ファイル %1 の名前を %2 に変更できません + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4496,7 +4666,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4728,6 +4898,12 @@ Server replied with error: %2 Retry all uploads すべてのアップロードを再試行 + + + + Resolve conflict + + OCC::UserModel @@ -5913,6 +6089,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file サーバー側バージョンがダウンロードされました。変更されたローカルファイルは、コンフリクトファイルにコピーしました。 + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_ko.ts b/translations/client_ko.ts index ed20fd036..91bc48d29 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -1044,6 +1044,156 @@ This action will abort any currently running synchronization. 복원 실패: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3389,6 +3539,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. 충돌: 서버 버전이 다운로드되었으며 로컬 사본의 이름이 바뀌었고 업로드되지 않았습니다. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3430,7 +3585,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss 유효하지 않은 수정 시간으로 인해 동기화할 수 없습니다. - + Error while deleting file record %1 from the database 파일 레코드 %1(을)를 데이터베이스에서 제거하는 중 오류 발생 @@ -3488,7 +3643,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB 로컬 데이터베이스에서 파일 %1을(를) 삭제할 수 없음 @@ -3528,7 +3683,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB 로컬 데이터베이스에서 파일 레코드 %1을(를) 제거할 수 없음 @@ -3579,6 +3734,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. %1 파일에 서버에서 보고된 유효하지 않은 수정 시간이 있습니다. 저장하지 마십시오. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3615,6 +3775,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 주의, 대소 문자 구분이 %1ê³¼ 충돌 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3651,6 +3816,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash 로컬 파일 이름 충돌로 인해 파일 %1의 이름을 %2로 바꿀 수 없습니다. + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4500,7 +4670,7 @@ Server replied with error: %2 파일 메타데이터를 업로드할 수 없음: %1 - + Could not set file record to local DB: %1 로컬 데이터베이스에서 파일 레코드 %1을(를) 설정할 수 없음 @@ -4732,6 +4902,12 @@ Server replied with error: %2 Retry all uploads 모든 업로드 다시 시도 + + + + Resolve conflict + + OCC::UserModel @@ -5917,6 +6093,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file 서버 버전 다운로드, 변경된 로컬 파일을 충돌 파일로 복사 + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts index 756bd817e..ab171bbc4 100644 --- a/translations/client_lt_LT.ts +++ b/translations/client_lt_LT.ts @@ -1040,6 +1040,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3364,6 +3514,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3405,7 +3560,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3463,7 +3618,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3503,7 +3658,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3554,6 +3709,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3590,6 +3750,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Dėmesio, galimas didžiųjų ir mažųjų raidžių nesuderinamumas su failu %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3626,6 +3791,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4475,7 +4645,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4707,6 +4877,12 @@ Server replied with error: %2 Retry all uploads Pakartoti visus įkėlimus + + + + Resolve conflict + + OCC::UserModel @@ -5892,6 +6068,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Atsisiųsta serverio versija, kompiuteryje esantis failas nukopijuotas į konfliktų failą + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_lv.ts b/translations/client_lv.ts index f72aaf34a..73f7a83e5 100644 --- a/translations/client_lv.ts +++ b/translations/client_lv.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3354,6 +3504,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3395,7 +3550,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3453,7 +3608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3493,7 +3648,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3544,6 +3699,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3580,6 +3740,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3616,6 +3781,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4463,7 +4633,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4695,6 +4865,12 @@ Server replied with error: %2 Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5880,6 +6056,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Servera versija lejupielādēta, kopēta izmainÄ«ta lokālā datne uz konfliktēto datni + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_mk.ts b/translations/client_mk.ts index 47086c0f3..2ba45c707 100644 --- a/translations/client_mk.ts +++ b/translations/client_mk.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3361,6 +3511,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. Конфликт: Верзијата од серверот е преземена, локалната верзија е преименувана и не е прикачена на серверот. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3402,7 +3557,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3460,7 +3615,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3500,7 +3655,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3551,6 +3706,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3587,6 +3747,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3623,6 +3788,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4472,7 +4642,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4704,6 +4874,12 @@ Server replied with error: %2 Retry all uploads Повтори ги сите прикачувања + + + + Resolve conflict + + OCC::UserModel @@ -5889,6 +6065,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Верзијата од серверот е преземена, преименувана е изменетата локална верзија во конфликт датотека + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index b5be9bcd6..2007700bb 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -1044,6 +1044,156 @@ Denne handlingen vil avbryte enhver synkronisering som kjører. Gjenoppretting feilet: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3362,6 +3512,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3403,7 +3558,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3461,7 +3616,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3501,7 +3656,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3552,6 +3707,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3588,6 +3748,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Merk! mulig sammenfall med %1 pga. sensitivitet for store/smÃ¥ bokstaver + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3624,6 +3789,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4473,7 +4643,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4705,6 +4875,12 @@ Server replied with error: %2 Retry all uploads Prøv alle opplastinger igjen + + + + Resolve conflict + + OCC::UserModel @@ -5890,6 +6066,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Server-versjon lastet ned, kopierte endret lokal fil til konfliktfil + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 7cbe28ed0..e5eb73d02 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -1043,6 +1043,156 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.Herstellen mislukt: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3389,6 +3539,11 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen Conflict: Server version downloaded, local copy renamed and not uploaded. Bestandsconflict: serverversie is gedownload, de lokale kopie is hernoemd en niet geüpload + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3430,7 +3585,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen - + Error while deleting file record %1 from the database @@ -3488,7 +3643,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3528,7 +3683,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen - + Could not delete file record %1 from local DB @@ -3579,6 +3734,11 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen File %1 has invalid modified time reported by server. Do not save it. Bestand %1 heeft een ongeldige wijzigingstijd gerapporteerd door de server. Bewaar het niet. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3615,6 +3775,11 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen Attention, possible case sensitivity clash with %1 Let op, mogelijk conflict hoofdlettergevoeligheid met 1% + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3651,6 +3816,11 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen File %1 cannot be renamed to %2 because of a local file name clash Bestand %1 kan niet worden hernoemd naar %2, omdat de naam conflicteert met een lokaal bestand + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4500,7 +4670,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4732,6 +4902,12 @@ Server replied with error: %2 Retry all uploads Probeer alle uploads opnieuw + + + + Resolve conflict + + OCC::UserModel @@ -5917,6 +6093,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Serverversie gedownload, gewijzigde lokale bestand gekopieerd in conflictbestand + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_oc.ts b/translations/client_oc.ts index febafdf6b..ee583a8a3 100644 --- a/translations/client_oc.ts +++ b/translations/client_oc.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3352,6 +3502,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3393,7 +3548,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3451,7 +3606,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3491,7 +3646,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3542,6 +3697,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3578,6 +3738,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3614,6 +3779,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4463,7 +4633,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4695,6 +4865,12 @@ Server replied with error: %2 Retry all uploads Tornar enviar totes los fichièrs + + + + Resolve conflict + + OCC::UserModel @@ -5880,6 +6056,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Version del servidor telecargada, copiada del fichièr local en conflicte + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_pl.ts b/translations/client_pl.ts index b19a4a384..b7e305995 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -1045,6 +1045,156 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.Przywracanie nie powiodło się: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3387,6 +3537,11 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł Conflict: Server version downloaded, local copy renamed and not uploaded. Konflikt: Pobrano wersję z serwera, nazwa lokalnej kopii została zmieniona i nie wysłana. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3428,7 +3583,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł Nie można zsynchronizować z powodu nieprawidłowego czasu modyfikacji - + Error while deleting file record %1 from the database Błąd podczas usuwania rekordu pliku %1 z bazy danych @@ -3486,7 +3641,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł OCC::PropagateDirectory - + could not delete file %1 from local DB Nie można usunąć pliku %1 z lokalnej bazy danych @@ -3526,7 +3681,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł - + Could not delete file record %1 from local DB Nie można usunąć rekordu pliku %1 z lokalnej bazy danych @@ -3577,6 +3732,11 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł File %1 has invalid modified time reported by server. Do not save it. Plik %1 ma nieprawidłowy czas modyfikacji zgłoszony przez serwer. Nie zapisuj go. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3613,6 +3773,11 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł Attention, possible case sensitivity clash with %1 Uwaga, możliwa niezgodność związana z wielością liter w %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3649,6 +3814,11 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł File %1 cannot be renamed to %2 because of a local file name clash Nie można zmienić nazwy pliku %1 na %2 z powodu konfliktu nazwy pliku lokalnego + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4500,7 +4670,7 @@ Serwer odpowiedział błędem: %2 Nie można zaktualizować metadanych pliku: %1 - + Could not set file record to local DB: %1 Nie można ustawić rekordu pliku na lokalną bazę danych: %1 @@ -4732,6 +4902,12 @@ Serwer odpowiedział błędem: %2 Retry all uploads Ponów wysłanie wszystkich plików + + + + Resolve conflict + + OCC::UserModel @@ -5917,6 +6093,11 @@ Serwer odpowiedział błędem: %2 Server version downloaded, copied changed local file into conflict file Pobrano wersję z serwera, zmieniona wersja lokalna została skopiowana do pliku konfliktu + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 1d3d0e0a0..3c85e60fe 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3356,6 +3506,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3397,7 +3552,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3455,7 +3610,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3495,7 +3650,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3546,6 +3701,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3582,6 +3742,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Atenção, possível sensibilidade a maiúsculas em conflito com %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3618,6 +3783,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4467,7 +4637,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4699,6 +4869,12 @@ Server replied with error: %2 Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5884,6 +6060,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Versão do servidor transferida, ficheiro local alterado copiado para o ficheiro de conflito + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index 05e4b15d6..ca26f3242 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -442,7 +442,7 @@ Disable encryption - + Desativar criptografia @@ -634,17 +634,17 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução. Disable end-to-end encryption - + Desative a criptografia de ponta a ponta Disable end-to-end encryption for %1? - + Desative a criptografia de ponta a ponta para %1? Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server. - + A remoção da criptografia de ponta a ponta removerá os arquivos criptografados localmente sincronizados.<br>Os arquivos criptografados permanecerão no servidor. @@ -1045,6 +1045,156 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.Falha na restauração: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -1866,7 +2016,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Could not decrypt! - + Não foi possível descriptografar! @@ -2611,7 +2761,7 @@ Os itens em que a exclusão é permitida serão excluídos se impedirem a remoç <p>Copyright 2017-2023 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p> - + <p>Direitos Autorais 2017-2023 Nextcloud GmbH<br />Direitos Autorais 2012-2023 ownCloud GmbH</p> @@ -3385,6 +3535,11 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr Conflict: Server version downloaded, local copy renamed and not uploaded. Conflito: versão do servidor baixada, cópia local renomeada e não carregada. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3426,7 +3581,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr Não é possível sincronizar devido ao horário de modificação inválido - + Error while deleting file record %1 from the database Erro ao excluir o registro de arquivo %1 do banco de dados @@ -3484,7 +3639,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr OCC::PropagateDirectory - + could not delete file %1 from local DB não foi possível eliminar o arquivo %1 do BD local @@ -3524,7 +3679,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr - + Could not delete file record %1 from local DB Não foi possível excluir o registro de arquivo %1 do BD local @@ -3575,6 +3730,11 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr File %1 has invalid modified time reported by server. Do not save it. O arquivo %1 possui erro na data/hora modificada informado pelo servidor. Não salvar. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3611,6 +3771,11 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr Attention, possible case sensitivity clash with %1 Atenção, possível caso de conflito de minúscula/maiúscula com %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3647,6 +3812,11 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr File %1 cannot be renamed to %2 because of a local file name clash O arquivo %1 não pode ser renomeada para %2 devido a um conflito com o nome de um arquivo local + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4498,7 +4668,7 @@ Servidor respondeu com erro: %2 Não foi possível atualizar os metadados do arquivo: %1 - + Could not set file record to local DB: %1 Não foi possível definir o registro do arquivo para o BD local: %1 @@ -4730,6 +4900,12 @@ Servidor respondeu com erro: %2 Retry all uploads Retentar todos os envios + + + + Resolve conflict + + OCC::UserModel @@ -5915,6 +6091,11 @@ Servidor respondeu com erro: %2 Server version downloaded, copied changed local file into conflict file Versão do servidor baixada, copiada a modificação do local do arquivo dentro do arquivo de conflito + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_ro.ts b/translations/client_ro.ts index d9d3875c5..fbdd0da6f 100644 --- a/translations/client_ro.ts +++ b/translations/client_ro.ts @@ -1044,6 +1044,156 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.Restaurarea a eșuat: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3368,6 +3518,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3409,7 +3564,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3467,7 +3622,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3507,7 +3662,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3558,6 +3713,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3594,6 +3754,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3630,6 +3795,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4477,7 +4647,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4709,6 +4879,12 @@ Server replied with error: %2 Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5894,6 +6070,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_ru.ts b/translations/client_ru.ts index 17cf47fd8..494a6bb2a 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -1043,6 +1043,156 @@ This action will abort any currently running synchronization. Восстановление не удалось: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3383,6 +3533,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. Конфликт: загружена версия файла с сервера, а локальная копия переименована и не передана на сервер. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3424,7 +3579,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss Синхронизация невозможна по причине некорректного времени изменения файла - + Error while deleting file record %1 from the database Не удалось удалить из базы данных запись %1 @@ -3482,7 +3637,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB не удалось удалить файл %1 из локальной базы данных @@ -3522,7 +3677,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB Не удалось удалить запись о файле %1 из локальной базы данных @@ -3573,6 +3728,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. Файл %1 имеет неверное время изменения, сообщенное сервером. Не сохраняйте его. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3609,6 +3769,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Внимание, возможен конфликт чувствительности к регистру имён с «%1» + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3645,6 +3810,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash Файл %1 не может быть переименован в %2 из-за локального конфликта имён + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4494,7 +4664,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 Не удалось сохранить запись о файле %1 в локальную базу данных @@ -4726,6 +4896,12 @@ Server replied with error: %2 Retry all uploads Повторить передачу файлов на сервер + + + + Resolve conflict + + OCC::UserModel @@ -5911,6 +6087,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Версия файла с сервера скачана, а изменённый локальный файл скопирован в конфликтующую версию. + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_sc.ts b/translations/client_sc.ts index e86e43ce4..ed432e7a6 100644 --- a/translations/client_sc.ts +++ b/translations/client_sc.ts @@ -1044,6 +1044,156 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3386,6 +3536,11 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal Conflict: Server version downloaded, local copy renamed and not uploaded. Cunflitu: versione de su serbidore iscarrigada, còpia locale torrada a numenare e non carrigada. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3427,7 +3582,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal - + Error while deleting file record %1 from the database @@ -3485,7 +3640,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3525,7 +3680,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal - + Could not delete file record %1 from local DB @@ -3576,6 +3731,11 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3612,6 +3772,11 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal Attention, possible case sensitivity clash with %1 Avisu, podet dare chi ddoe est un'errore dèpidu a s'impreu de is maiùsculas o minùsculas cun %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3648,6 +3813,11 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal File %1 cannot be renamed to %2 because of a local file name clash S'archìviu %1 non faghet a ddu torrare a numenare %2 pro unu cunflitu cun su nùmene de s'archìviu locale + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4497,7 +4667,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4729,6 +4899,12 @@ Server replied with error: %2 Retry all uploads Torra a proare totu is carrigamentos + + + + Resolve conflict + + OCC::UserModel @@ -5914,6 +6090,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Versione de su serbidore iscarrigada, s'archìviu locale modificadu est istadu copiadu comente archìviu de cunflitu + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_sk.ts b/translations/client_sk.ts index 53bb9be8e..63db27fa4 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -1044,6 +1044,156 @@ Táto akcia zruší vÅ¡etky prebiehajúce synchronizácie. Obnovenie zlyhalo: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3386,6 +3536,11 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiÅ¥, nahláste v Conflict: Server version downloaded, local copy renamed and not uploaded. Konflikt: Prevzatá verzia zo servera, lokálna kópia premenovaná a neodovzdaná. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3427,7 +3582,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiÅ¥, nahláste v Chyba pri synchronizácii z dôvodu neplatného času poslednej zmeny - + Error while deleting file record %1 from the database Chyba pri mazaní záznamu o súbore %1 z databázy @@ -3485,7 +3640,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiÅ¥, nahláste v OCC::PropagateDirectory - + could not delete file %1 from local DB nie je možné vymazaÅ¥ súbor %1 z lokálnej DB @@ -3525,7 +3680,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiÅ¥, nahláste v - + Could not delete file record %1 from local DB Nie je možné vymazaÅ¥ záznam o súbore %1 z lokálnej DB @@ -3576,6 +3731,11 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiÅ¥, nahláste v File %1 has invalid modified time reported by server. Do not save it. Súbor %1 má neplatný čas poslednej zmeny nahlásený serverom. Neukladajte si to. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3612,6 +3772,11 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiÅ¥, nahláste v Attention, possible case sensitivity clash with %1 Pozor, možná kolízia z dôvodu veľkosti písmen s %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3648,6 +3813,11 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiÅ¥, nahláste v File %1 cannot be renamed to %2 because of a local file name clash Súbor %1 nemôže byÅ¥ premenovaný na %2 z dôvodu, že tento názov je už použitý + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4497,7 +4667,7 @@ Server replied with error: %2 Nemôžem aktualizovaÅ¥ metadáta súboru: %1 - + Could not set file record to local DB: %1 Nie je možné vytvoriÅ¥ záznam o súbore v lokálnej DB: %1 @@ -4729,6 +4899,12 @@ Server replied with error: %2 Retry all uploads ZopakovaÅ¥ vÅ¡etky nahrávania + + + + Resolve conflict + + OCC::UserModel @@ -5914,6 +6090,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Verzia zo servera bola stiahnutá, kópia zmenila lokálny súbor na konfliktný súbor + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 946c43084..f04f7a93f 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -1044,6 +1044,156 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.Obnovitev je spodletela: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3386,6 +3536,11 @@ To je nov preizkusni način. Če ga boste uporabili, poÅ¡ljite tudi poročila o Conflict: Server version downloaded, local copy renamed and not uploaded. Spor: prejeta je strežniÅ¡ka različica, krajevna je preimenovana, a ne tudi poslana v oblak. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3427,7 +3582,7 @@ To je nov preizkusni način. Če ga boste uporabili, poÅ¡ljite tudi poročila o - + Error while deleting file record %1 from the database @@ -3485,7 +3640,7 @@ To je nov preizkusni način. Če ga boste uporabili, poÅ¡ljite tudi poročila o OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3525,7 +3680,7 @@ To je nov preizkusni način. Če ga boste uporabili, poÅ¡ljite tudi poročila o - + Could not delete file record %1 from local DB @@ -3576,6 +3731,11 @@ To je nov preizkusni način. Če ga boste uporabili, poÅ¡ljite tudi poročila o File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3612,6 +3772,11 @@ To je nov preizkusni način. Če ga boste uporabili, poÅ¡ljite tudi poročila o Attention, possible case sensitivity clash with %1 Pozor! Mogoče je neskladje v velikosti črk imena %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3648,6 +3813,11 @@ To je nov preizkusni način. Če ga boste uporabili, poÅ¡ljite tudi poročila o File %1 cannot be renamed to %2 because of a local file name clash Datoteke %1 ni mogoče preimenovati v %2 zaradi že obstoječe datoteke s tem imenom. + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4497,7 +4667,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4729,6 +4899,12 @@ Server replied with error: %2 Retry all uploads Ponovi poÅ¡iljanje vseh predmetov + + + + Resolve conflict + + OCC::UserModel @@ -5914,6 +6090,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file StrežniÅ¡ka različica je prejeta, v datoteko sporov pa je bila kopirana tudi spremenjena krajevna datoteka + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_sr.ts b/translations/client_sr.ts index df83cd33a..b56bc11c6 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -1040,6 +1040,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3364,6 +3514,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3405,7 +3560,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3463,7 +3618,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3503,7 +3658,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3554,6 +3709,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3590,6 +3750,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Пажња! Могуће сударање због величине слова са %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3626,6 +3791,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4475,7 +4645,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4707,6 +4877,12 @@ Server replied with error: %2 Retry all uploads Понови сва отпремања + + + + Resolve conflict + + OCC::UserModel @@ -5892,6 +6068,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Скинута серверска верзија, копирам измењени локални фајл у конфликтни фајл + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 943459968..3ff03e76b 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -442,7 +442,7 @@ Disable encryption - + Inaktivera kryptering @@ -634,17 +634,17 @@ Den här Ã¥tgärden avbryter alla synkroniseringar som körs. Disable end-to-end encryption - + Inaktivera ändpunkt-till-ändpunkt-kryptering Disable end-to-end encryption for %1? - + Inaktivera ändpunkt-till-ändpunkt-kryptering för %1? Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server. - + Om du tar bort ändpunkt-till-ändpunkt-kryptering tar du bort lokalt synkroniserade filer som är krypterade.<br>Krypterade filer kommer att finnas kvar pÃ¥ servern. @@ -1045,6 +1045,156 @@ Den här Ã¥tgärden avbryter alla synkroniseringar som körs. Återställning misslyckades: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -1868,7 +2018,7 @@ Om detta var ett misstag och du vill behÃ¥lla dina filer, kommer de att synkroni Could not decrypt! - + Kunde inte dekryptera! @@ -2324,7 +2474,9 @@ Om detta var ett misstag och du vill behÃ¥lla dina filer, kommer de att synkroni The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version. - + Uppdateringskanalen avgör vilka klientuppdateringar som kommer att erbjudas för installation. Den "stabila" kanalen innehÃ¥ller endast uppgraderingar som anses tillförlitliga, medan versionerna i "beta"-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: SÃ¥ att gÃ¥ tillbaka frÃ¥n betakanalen till den stabila kanalen kan vanligtvis inte göras omedelbart och innebär att vänta pÃ¥ en stabil version som är nyare än den för närvarande installerade betaversionen. @@ -2611,7 +2763,7 @@ Objekt där radering är tillÃ¥tet raderas om de förhindrar att en mapp tas bor <p>Copyright 2017-2023 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p> - + <p>Copyright 2017-2023 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p> @@ -3385,6 +3537,11 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda Conflict: Server version downloaded, local copy renamed and not uploaded. Konflikt: Serverversion hämtad, lokal kopia omdöpt och inte uppladdad. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3426,7 +3583,7 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda Det gÃ¥r inte att synkronisera pÃ¥ grund av ogiltig ändringstid - + Error while deleting file record %1 from the database Fel vid borttagning av filpost %1 frÃ¥n databasen @@ -3484,7 +3641,7 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda OCC::PropagateDirectory - + could not delete file %1 from local DB Kunde inte ta bort filen %1 frÃ¥n lokal DB @@ -3524,7 +3681,7 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda - + Could not delete file record %1 from local DB Kunde inte ta bort filposten %1 frÃ¥n lokal DB @@ -3575,6 +3732,11 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda File %1 has invalid modified time reported by server. Do not save it. Filen %1 har en ogiltig ändringstid rapporterad av servern. Spara den inte. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3611,6 +3773,11 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda Attention, possible case sensitivity clash with %1 Observera, eventuell skiftlägeskänslig konflikt med %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3647,6 +3814,11 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda File %1 cannot be renamed to %2 because of a local file name clash Filen %1 kan inte döpas om till %2 pÃ¥ grund av namnkonflikt med en lokal fil + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4498,7 +4670,7 @@ Servern svarade med fel: %2 Kunde inte uppdatera filens metadata: %1 - + Could not set file record to local DB: %1 Kunde inte ställa in filposten till lokal DB: %1 @@ -4730,6 +4902,12 @@ Servern svarade med fel: %2 Retry all uploads Försök ladda upp igen + + + + Resolve conflict + + OCC::UserModel @@ -5915,6 +6093,11 @@ Servern svarade med fel: %2 Server version downloaded, copied changed local file into conflict file Serverversion hämtad, kopierade den ändrade lokala filen till konfliktfil + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_th.ts b/translations/client_th.ts index 10657a1c3..9dcefe7c6 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -1039,6 +1039,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3358,6 +3508,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3399,7 +3554,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3457,7 +3612,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3497,7 +3652,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3548,6 +3703,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3584,6 +3744,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 คำเตือน เป็นไปได้ว่ามีตัวพิมพ์เล็กใหญ่เหมือนกับ %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3620,6 +3785,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4468,7 +4638,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4700,6 +4870,12 @@ Server replied with error: %2 Retry all uploads + + + + Resolve conflict + + OCC::UserModel @@ -5885,6 +6061,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file ดาวน์โหลดรุ่นของเซิร์ฟเวอร์แล้ว คัดลอกไฟล์ต้นฉบับที่ถูกเปลี่ยนไปยังไฟล์ขัดแย้งแล้ว + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 075f5c94b..f9d6f3998 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -442,7 +442,7 @@ Disable encryption - + Şifreleme kullanılmasın @@ -634,17 +634,17 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur. Disable end-to-end encryption - + Uçtan uca şifreleme kullanılmasın Disable end-to-end encryption for %1? - + %1 için uçtan uca şifreleme kapatılsın mı? Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server. - + Uçtan uca şifrelemenin kapatılması, yerel olarak eşitlenmiş şifrelenmiş dosyaları kaldırır.<br>Şifrelenmiş dosyalar sunucuda kalır. @@ -1045,6 +1045,156 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.Geri yüklenemedi: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -1867,7 +2017,7 @@ Bu işlemi yanlışlıkla yaptıysanız ve dosyalarınızı korumak istiyorsanı Could not decrypt! - + Şifre çözülemedi! @@ -2612,7 +2762,7 @@ Silme izni verildiğinde bir klasörün silinmesini engelleyen ögeler silinir. <p>Copyright 2017-2023 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p> - + <p>Telif hakları 2017-2023 Nextcloud GmbH<br />Telif hakları 2012-2023 ownCloud GmbH</p> @@ -3386,6 +3536,11 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş Conflict: Server version downloaded, local copy renamed and not uploaded. Çakışma: Sunucu sürümü indirildi, yerel kopya yeniden adlandırıldı ve yüklenmedi. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3427,7 +3582,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş Değiştirilme zamanı geçersiz olduğundan eşitlenemedi - + Error while deleting file record %1 from the database %1 dosya kaydı veritabanından silinirken sorun çıktı @@ -3485,7 +3640,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş OCC::PropagateDirectory - + could not delete file %1 from local DB %1 dosyası yerel veritabanından silinemedi @@ -3525,7 +3680,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş - + Could not delete file record %1 from local DB %1 dosya kaydı yerel veritabanından silinemedi @@ -3576,6 +3731,11 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş File %1 has invalid modified time reported by server. Do not save it. Sunucu tarafından bildirilen %1 dosyasının değiştirilme tarihi geçersiz. Kaydedilmedi. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3612,6 +3772,11 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş Attention, possible case sensitivity clash with %1 Uyarı, %1 ile olası büyük küçük harf duyarlılığı çakışması + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3648,6 +3813,11 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş File %1 cannot be renamed to %2 because of a local file name clash Yerel bir dosya adı ile çakışması nedeniyle %1 dosyası %2 olarak adlandırılamadı + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4499,7 +4669,7 @@ Sunucunun verdiği hata yanıtı: %2 Dosya üst verileri güncellenemedi: %1 - + Could not set file record to local DB: %1 Dosya kaydı yerel veritabanına yapılamadı: %1 @@ -4731,6 +4901,12 @@ Sunucunun verdiği hata yanıtı: %2 Retry all uploads Tüm yüklemeleri yinele + + + + Resolve conflict + + OCC::UserModel @@ -5916,6 +6092,11 @@ Sunucunun verdiği hata yanıtı: %2 Server version downloaded, copied changed local file into conflict file Sunucu sürümü indirildi, değiştirilmiş yerel dosya çakışan dosya içine kopyalandı + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 0b8911521..3584fd404 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -1044,6 +1044,156 @@ This action will abort any currently running synchronization. Відновлення не вдалося: %1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3386,6 +3536,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. Конфлікт: Звантажено версію з хмари, копію на пристрої перейменовано і не завантажено. + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3427,7 +3582,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss Неможливо виконати синхронізацію через неправильний час модифікації - + Error while deleting file record %1 from the database Помилка під час вилучення запису файлу %1 з бази даних @@ -3485,7 +3640,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB неможливо вилучити файл %1 з локальною БД @@ -3525,7 +3680,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB Неможливо вилучити запис файлу %1 з локальної БД @@ -3576,6 +3731,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. Сервер визначив, що файл %1 має неправильний час зміни. Не зберігайте його. + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3612,6 +3772,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 Увага, можливий конфлікт чутливості до реєстру з %1 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3648,6 +3813,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash Файл %1 неможливо перейменувати у %2 через конфлікт з назвою файлу на пристрої + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4497,7 +4667,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 Неможливо встановити запис файлу до локальної БД: %1 @@ -4729,6 +4899,12 @@ Server replied with error: %2 Retry all uploads Првторити усі завантаження + + + + Resolve conflict + + OCC::UserModel @@ -5914,6 +6090,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file Серверну версію звантажено, скопійовано змінений на пристрої файл до конфліктного файлу + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index 14a22951d..bbbf65afa 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -1041,6 +1041,156 @@ This action will abort any currently running synchronization. + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -3374,6 +3524,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. 冲突：服务器版本已下载，本地副本已重命名，但未上传。 + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3415,7 +3570,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Error while deleting file record %1 from the database @@ -3473,7 +3628,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB @@ -3513,7 +3668,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB @@ -3564,6 +3719,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. 服务器报告文件 %1 的修改时间无效。不要保存它。 + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3600,6 +3760,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 小心！%1 的文件名可能有大小写冲突 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3636,6 +3801,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash 文件 %1 无法被重命名至 %2，因为一个本地文件名冲突 + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4485,7 +4655,7 @@ Server replied with error: %2 - + Could not set file record to local DB: %1 @@ -4717,6 +4887,12 @@ Server replied with error: %2 Retry all uploads 重试所有上传 + + + + Resolve conflict + + OCC::UserModel @@ -5902,6 +6078,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file 服务器版本已下载，复制并修改本地冲突文件 + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts index 24ba5f7a1..634f4ff5c 100644 --- a/translations/client_zh_HK.ts +++ b/translations/client_zh_HK.ts @@ -443,7 +443,7 @@ Disable encryption - + 停用加密 @@ -635,17 +635,17 @@ This action will abort any currently running synchronization. Disable end-to-end encryption - + 停用端到端加密 Disable end-to-end encryption for %1? - + 停用 %1 的端到端加密？ Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server. - + 刪除端到端加密將刪除本地同步的加密檔案。<br>加密檔案將保留在伺服器上。 @@ -1046,6 +1046,156 @@ This action will abort any currently running synchronization. 復原失敗；%1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -1867,7 +2017,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Could not decrypt! - + 無法解密！ @@ -2612,7 +2762,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <p>Copyright 2017-2023 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p> - + <p> 2017-2023 Nextcloud GmbH 版權所有<br />2012-2023 ownCloud GmbH 版權所有</p> @@ -3386,6 +3536,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. 抵觸：已下載伺服器版本，近端版本已更名但並未上傳。 + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3427,7 +3582,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss 由於修改時間無效，無法同步 - + Error while deleting file record %1 from the database 從數據庫中刪除檔案記錄 %1 時出錯 @@ -3485,7 +3640,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB 無法從近端數據庫中刪除檔案 %1 @@ -3525,7 +3680,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB 無法從近端數據庫中刪除檔案 %1 @@ -3576,6 +3731,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. 伺服器報告檔案 %1 的修改時間無效。 不要保存它。 + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3612,6 +3772,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 注意! %1 的名稱可能有大小寫衝突。 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3648,6 +3813,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash 檔案 %1 無法更名成 %2，因為近端端的檔案名稱已毀損 + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4499,7 +4669,7 @@ Server replied with error: %2 無法更新檔案元數據：%1 - + Could not set file record to local DB: %1 無法將檔案記錄設置到近端數據庫: %1 @@ -4731,6 +4901,12 @@ Server replied with error: %2 Retry all uploads 重試所有上傳 + + + + Resolve conflict + + OCC::UserModel @@ -5916,6 +6092,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file 已下載伺服器上的版本，並將近端已更改的檔案複製至抵觸檔案 + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index fd89f481c..e0af75471 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -442,7 +442,7 @@ Disable encryption - + 停用加密 @@ -634,17 +634,17 @@ This action will abort any currently running synchronization. Disable end-to-end encryption - + 停用端到端加密 Disable end-to-end encryption for %1? - + 停用 %1 的端到端加密？ Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server. - + 移除端到端加密將會移除本機同步的加密檔案。<br>加密檔案將會保留在伺服器上。 @@ -783,17 +783,17 @@ This action will abort any currently running synchronization. The authenticated request to the server was redirected to "%1". The URL is bad, the server is misconfigured. - + 對伺服器的已驗證請求將會被重新導向至「%1」。URL 錯誤，伺服器設定錯誤。 Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser. - + 伺服器禁止存取。為了驗證您是否有適當的存取權限，<a href="%1">點擊此處</a>以使用您的瀏覽器存取服務。 There was an invalid response to an authenticated WebDAV request - + 伺服器回應 WebDAV 驗證請求無效 @@ -1045,6 +1045,156 @@ This action will abort any currently running synchronization. 還原失敗：%1 + + OCC::CaseClashConflictSolver + + + Cannot rename file because a file with the same name does already exist on the server. Please pick another name. + + + + + Could not rename file. Please make sure you are connected to the server. + + + + + You don't have the permission to rename this file. Please ask the author of the file to rename it. + + + + + Failed to fetch permissions with error %1 + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + OCC::CaseClashFilenameDialog + + + Case Clash Conflict + + + + + The file could not be synced because it generates a case clash conflict with an existing file on this system. + + + + + Error + + + + + Existing file + + + + + fileA + + + + + + today + + + + + + 0 byte + + + + + + Open existing file + + + + + Case clashing file + + + + + fileB + + + + + + Open clashing file + + + + + Please enter a new name for the clashing file: + + + + + New filename + + + + + Rename file + + + + + The file "%1" could not be synced because of a case clash conflict with an existing file on this system. + + + + + %1 does not support equal file names with only letter casing differences. + + + + + Filename contains leading and trailing spaces. + + + + + Filename contains leading spaces. + + + + + Filename contains trailing spaces. + + + + + Use invalid name + + + + + Filename contains illegal characters: %1 + + + OCC::CleanupPollsJob @@ -1868,7 +2018,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Could not decrypt! - + 無法解密！ @@ -2613,7 +2763,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <p>Copyright 2017-2023 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p> - + <p>Copyright 2017-2023 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p> @@ -3387,6 +3537,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Conflict: Server version downloaded, local copy renamed and not uploaded. 衝突：已下載伺服器的版本，本機版本已更名但並未上傳。 + + + Case Clash Conflict: Server file downloaded and renamed to avoid clash. + + The filename cannot be encoded on your file system. @@ -3428,7 +3583,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss 由於修改時間無效，因此無法同步 - + Error while deleting file record %1 from the database 從資料庫刪除紀錄 %1 時發生錯誤 @@ -3486,7 +3641,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss OCC::PropagateDirectory - + could not delete file %1 from local DB 無法從本機資料庫中刪除檔案 %1 @@ -3526,7 +3681,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + Could not delete file record %1 from local DB 無法從本機資料庫刪除檔案紀錄 %1 @@ -3577,6 +3732,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 has invalid modified time reported by server. Do not save it. 伺服器回報檔案 %1 的修改時間無效。不要儲存。 + + + File %1 downloaded but it resulted in a local file name clash! + + Error updating metadata: %1 @@ -3613,6 +3773,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss Attention, possible case sensitivity clash with %1 注意，%1 的名稱可能有大小寫衝突 + + + Folder %1 cannot be created because of a local file or folder name clash! + + Could not create folder %1 @@ -3649,6 +3814,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss File %1 cannot be renamed to %2 because of a local file name clash 檔案 %1 無法重新命名為 %2，因為本機檔案名稱有衝突 + + + File %1 downloaded but it resulted in a local file name clash! + + @@ -4117,7 +4287,9 @@ This is a new, experimental mode. If you decide to use it, please report any iss Could not encrypt the following folder: "%1". Server replied with error: %2 - + 無法加密以下資料夾：「%1」。 + +伺服器回覆錯誤：%2 @@ -4498,7 +4670,7 @@ Server replied with error: %2 無法更新檔案詮釋資料：%1 - + Could not set file record to local DB: %1 無法將檔案紀錄設定至本機資料庫：%1 @@ -4730,6 +4902,12 @@ Server replied with error: %2 Retry all uploads 重試所有上傳 + + + + Resolve conflict + + OCC::UserModel @@ -5354,17 +5532,17 @@ Server replied with error: %2 Create a new share link - + 建立新分享連結 Copy share link location - + 複製分享連結位置 Share options - + 分享選項 @@ -5372,57 +5550,57 @@ Server replied with error: %2 An error occurred setting the share password. - + 設定分享密碼時發生錯誤 Edit share - + 編輯分享 Dismiss - + 忽略 Share label - + 分享標籤 Allow editing - + 允許編輯 Password protect - + 密碼保護 Set expiration date - + 設定到期日 Note to recipient - + 給收件人的備註 Unshare - + 取消分享 Add another link - + 新增其他連結 Copy share link - + 複製分享連結 @@ -5527,7 +5705,7 @@ Server replied with error: %2 No results for - + 沒有結果 @@ -5535,7 +5713,7 @@ Server replied with error: %2 Search results section %1 - + 搜尋結果部份 %1 @@ -5915,6 +6093,11 @@ Server replied with error: %2 Server version downloaded, copied changed local file into conflict file 已下載伺服器上的版本，並將本機已更改的檔案複製至衝突檔案 + + + Server version downloaded, copied changed local file into case conflict conflict file + + Deleted