diff options
| author | Nextcloud bot <bot@nextcloud.com> | 2022-05-17 07:11:02 +0300 |
|---|---|---|
| committer | Nextcloud bot <bot@nextcloud.com> | 2022-05-17 07:11:02 +0300 |
| commit | 9a76e015ed5a879be82fa53ebd5363949a226ec7 (patch) | |
| tree | 605224f6c1807fb0bf1ef35742515b3d26022c70 | |
| parent | e55eb9652a6d45613392a85f5ed5d5a0f963724e (diff) | |
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
56 files changed, 9439 insertions, 6359 deletions
diff --git a/translations/client_bg.ts b/translations/client_bg.ts index be499b557..d0395cae0 100644 --- a/translations/client_bg.ts +++ b/translations/client_bg.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>Показване на повече действия</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>Отхвърляне</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>Отваряне на диалоговия прозорец за споделяне</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -752,47 +752,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Отписан</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Без връзка</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Свързан</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Услугата не е налична</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Режим на поддръжка</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Мрежова грешка</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Грешка с конфигурацията</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Въведете потребителска информация за вход</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Непознато състояние на профила</translation> </message> @@ -800,17 +800,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>За повече дейности, моля, отворете приложението Дейност.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Файловете от списъка за игнориране, както и символните връзки, не са синхронизирани.</translation> </message> @@ -1590,7 +1590,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Ако това е инцидент и решите да запазите файловете си, те ще бъдат синхронизирани отново от сървъра.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1601,7 +1601,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a Ако решите да изтриете файловете, те ще бъдат недостъпни за вас, освен ако не сте собственикът.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1610,17 +1610,17 @@ If this was an accident and you decide to keep your files, they will be re-synce Ако това е инцидент и решите да запазите файловете си, те ще бъдат синхронизирани отново от сървъра.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Да се премахнат ли всички файлове?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Премахване на всички файлове</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Запазване на файловете</translation> </message> @@ -2503,7 +2503,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>Нново име на файл</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Преименуване на файл</translation> </message> @@ -2514,29 +2514,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>Следните знаци не са разрешени в системата: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>Нямате право да преименувате този файл. Моля, помолете автора на файла да го преименува.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>Името на файла съдържа невалидни знаци: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Файлът не можа да се преименува. Моля, уверете се, че сте свързани със сървъра. </translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Не може да се преименува файл, защото на сървъра, вече съществува файл със същото име. Моля, изберете друго име.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3487,27 +3532,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>Файлът съдържа крайни интервали и не може да бъде преименуван, тъй като файл със същото име вече съществува на сървъра.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>Файлът съдържа крайни интервали и не може да бъде преименуван, тъй като файл със същото име вече съществува локално.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Не се поддържат символни връзки при синхронизиране.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Файлът е посочен в списъка за игнориране.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Имена на файлове, завършващи с точка, не се поддържат от тази файлова система.</translation> </message> @@ -3517,62 +3552,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Имената на файлове, съдържащи символа '% 1', не се поддържат от тази файлова система.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>Имената на файлове, съдържащи символа „%1“, не се поддържат в тази файлова система.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Името на файла съдържа поне един невалиден знак</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Името на файла е запазено име на тази файлова система.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>Името на файла съдържа крайни интервали.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Името на файла е твърде дълго.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Файл / папка се игнорира, защото е скрит.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Неуспешен Отчет</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Конфликт: Изтеглена е версия на сървъра, а локалното копие е преименувано и не е качено.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>Името на файла не може да бъде кодирано във вашата система от файлове.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>Името на файла е в черния списък на сървъра.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>Файлът има разширение, запазено за виртуални файлове.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>размер</translation> </message> @@ -3582,27 +3627,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>права</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>сървърът е отчел не % 1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>право</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>идентификатор на файла</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>Файлът съдържа крайни интервали и не може да бъде преименуван, тъй като файл със същото име вече съществува на сървъра.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>Файлът съдържа крайни интервали и не може да бъде преименуван, тъй като файл със същото име вече съществува локално.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>сървърът е отчел не % 1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>Сървърът е отчел не % 1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation>Не може да се синхронизира поради невалиден час на модификация</translation> </message> @@ -3612,47 +3667,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Конфликт при качване на някои файлове в папка. Тези, които са в конфликт, ще се изчистят!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Конфликт при качване на папка. Ще бъде изчистен!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Конфликт при качване на файл. Ще бъде премахнат!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Игнориран заради черния списък 'изберете какво да синхронизирате'</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Не е разрешено, защото нямате право да добавяте подпапки към тази папка</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Не е разрешено, защото нямате право да добавяте файлове в тази папка</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Не е позволено да качвате този файл, тъй като той е само за четене на сървъра, възстановява се</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Преместено в невалидна цел, възстановява се</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Не е позволено да се премахва, възстановява се</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Грешка при четене на базата данни</translation> </message> @@ -3662,7 +3717,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Сървърът отговори с грешка при четене на директория '% 1' : % 2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Сървърът отговори с грешка при четене на директория „%1“: %2</translation> </message> @@ -4116,7 +4171,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Избор на елементи за синхронизиране</translation> </message> @@ -4144,13 +4199,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Размер</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>В момента на сървъра няма подпапки.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation> Възникна грешка при зареждането на списъка с подпапки.</translation> </message> @@ -4158,12 +4213,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation>Отговор</translation> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Отхвърли</translation> </message> @@ -4210,11 +4265,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Път на ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Икона</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation> споделяне на етикет</translation> @@ -4225,6 +4275,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Път в Nextcloud</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Икона</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4404,27 +4459,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Изтрий споделената връзка</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Потвърждава Изтриването на Споделяне на Връзки</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Наистина ли желаете да изтриете споделеното с публична връзка <i>%1</i>?</p><p>Бележка: Изтриването е необратима операция.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Изтрий</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Отказ</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Публична връзка</translation> </message> @@ -5153,12 +5208,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Кодирането на име на файл е невалидно</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Не може да се чете от дневника за синхронизиране.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Не може да се отвори дневника за синхронизиране.</translation> </message> @@ -5173,17 +5228,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Името на файла съдържа поне един невалиден знак</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>Синхронизацията ще се възобнови скоро.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Дисковото пространство е малко: Пропуснати са изтегляния, които биха намалили свободното място под% 1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>На сървъра няма достатъчно място за някои качвания.</translation> </message> @@ -5446,66 +5501,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Съобщението за състоянието на потребителя не можа да бъде изчистено. Уверете се, че сте свързани със сървъра.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Да не се изчиства</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 минути</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 час</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 часа</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Днес</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Тази седмица</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>По-малко от минута</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 минута</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 минути</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 часове</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 ден</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 дни</translation> </message> @@ -6171,7 +6226,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>На линия</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>Маркиране като прочетено</translation> </message> @@ -6187,12 +6242,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation>Отговаряне на …</translation> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation>Изпращане на отговор на съобщение в чата</translation> </message> diff --git a/translations/client_br.ts b/translations/client_br.ts index c10a3f77e..568df2685 100644 --- a/translations/client_br.ts +++ b/translations/client_br.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -748,47 +748,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Mont kuit</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Digemprennet</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Kemprennet</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>N'ez eus ket eus ar servij</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Mod dec'hel</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Fazi network</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Ur fazi arventenn</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Goulenn an titouroù idantitelezh</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Stad kont dianv</translation> </message> @@ -796,17 +796,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Evit muioc'h a oberniantiz digorit ar meziant oberiantiz.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1578,7 +1578,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1586,24 +1586,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -2484,7 +2484,7 @@ Traoù lec'h m'eo aotreet al lemel a vo lamet ma ampechont lamadur an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2495,29 +2495,74 @@ Traoù lec'h m'eo aotreet al lemel a vo lamet ma ampechont lamadur an </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3458,27 +3503,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3488,62 +3523,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3553,27 +3598,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3583,47 +3638,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3633,7 +3688,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4087,7 +4142,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Choazit petra kemprennañ</translation> </message> @@ -4115,13 +4170,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ment</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Isteuiadoù ebet er servijour evit ar poent.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Ur fazi a zo bet e pad kargadenn ar roll an iz-teuliadoù.</translation> </message> @@ -4129,12 +4184,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Arrest</translation> </message> @@ -4181,11 +4236,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Hent ownCloud :</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Skeudennig</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>rannañ tikedenn</translation> @@ -4196,6 +4246,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Hent Nextcloud :</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Skeudennig</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4375,27 +4430,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Lemmet al liamm rannet</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Gwiriañ Lamadenn al Liamm Rannañ</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Sur oc'h ho peus c'hoant lemel al liamm rannañ publik <i>%1</i> ?</p><p>Notenn : Ne vo ket posupl hen disober.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Diverkañ</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Arrest</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Liamm publik</translation> </message> @@ -5124,12 +5179,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>N'eo ket mat sifradur an anv restr</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Dibosupl eo lenn ar gazetenn kemprenn.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Dibosupl eo digeriñ ar gazetenn kemprenn</translation> </message> @@ -5144,17 +5199,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Un arouez fall ez eus d'an neubeutañ en anv restr</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Plas el lenner re vihan : ar bellgargadennoù a lako ar plas dieub da mont dindan %1 a vo ankouaet.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>N'ez eus ket trawalc'h a blas war ar servijour evit pelgasadennoù zo.</translation> </message> @@ -5417,66 +5472,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6142,7 +6197,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6158,12 +6213,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_ca.ts b/translations/client_ca.ts index 706d222ae..12682bda2 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>Mostra més accions</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>Descarta</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>Obre el diàleg per compartir</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>S'ha tancat la sessió</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Desconnectat</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Connectat</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servei no disponible</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Mode de manteniment</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Error de xarxa</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Error de configuració</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>S'estan demanant les credencials</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Estat del compte desconegut</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Per a veure més activitats, obriu l'aplicació Activitat.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Els fitxers de la llista de fitxers ignorats i els enllaços simbòlics no se sincronitzen.</translation> </message> @@ -1572,7 +1572,7 @@ Segur que voleu sincronitzar aquestes accions amb el servidor? Si es tracta d'un accident i decidiu mantenir els fitxers, es tornaran a sincronitzar des del servidor.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1580,24 +1580,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Voleu suprimir tots els fitxers?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Suprimeix tots els fitxers</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Mantén els fitxers</translation> </message> @@ -2474,7 +2474,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2485,29 +2485,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3447,27 +3492,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>No s'admet la sincronització d'enllaços simbòlics.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>El fitxer és a la llista de fitxers ignorats.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>No s'admeten els noms de fitxer que finalitzen amb un punt en aquest sistema de fitxers.</translation> </message> @@ -3477,62 +3512,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>No s'admeten els noms de fitxers que contenen el caràcter «%1» en aquest sistema de fitxers.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>El nom del fitxer conté com a mínim un caràcter no vàlid</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Aquest nom de fitxer és un nom reservat en aquest sistema de fitxers.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>El nom del fitxer conté espais finals.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>El nom del fitxer és massa llarg.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>S'ignora el fitxer o la carpeta perquè està ocult.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>S'ha produït un error en comprovar l'estat.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Conflicte: s'ha baixat la versió del servidor, s'ha canviat el nom de la còpia local i no s'ha pujat.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>El nom del fitxer no es pot codificar en el vostre sistema de fitxers.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>El nom del fitxer es troba en la llista de prohibicions del servidor.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>El fitxer té una extensió reservada per als fitxers virtuals.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>mida</translation> </message> @@ -3542,27 +3587,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>permisos</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>id de fitxer</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3572,47 +3627,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>S'ha ignorat perquè es troba a la llista de prohibicions «Trieu què voleu sincronitzar»</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>No es permet perquè no teniu permís per a afegir subcarpetes en aquesta carpeta</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>No es permet perquè no teniu permís per a afegir fitxers en aquesta carpeta</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>No es permet carregar aquest fitxer perquè és de només lectura en el servidor; s'està restaurant</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>S'ha mogut a una destinació no vàlida; s'està restaurant</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>No es permet suprimir; s'està restaurant</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Error while reading the database</translation> </message> @@ -3622,7 +3677,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>El servidor ha respost amb un error en llegir la carpeta «%1»: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4076,7 +4131,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Trieu què voleu sincronitzar</translation> </message> @@ -4104,13 +4159,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Mida</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Actualment no hi ha subcarpetes en el servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>S'ha produït un error en carregar la llista de subcarpetes.</translation> </message> @@ -4118,12 +4173,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Descarta</translation> </message> @@ -4170,11 +4225,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Camí de l'ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Icona</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>etiqueta de compartició</translation> @@ -4185,6 +4235,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Camí del Nextcloud:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Icona</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4364,27 +4419,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Suprimeix l'enllaç de compartició</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirmeu la supressió de l'enllaç de compartició</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Segur que voleu suprimir l'enllaç públic de compartició <i>%1</i>?</p><p>Nota: aquesta acció no es pot desfer.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Suprimeix</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Cancel·la</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Enllaç públic</translation> </message> @@ -5113,12 +5168,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>La codificació del nom de fitxer no és vàlida.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>No s'ha pogut llegir el diari de sincronització.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>No es pot obrir el diari de sincronització</translation> </message> @@ -5133,17 +5188,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>El nom del fitxer conté com a mínim un caràcter no vàlid</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Queda poc espai en el disc: s'han omès les baixades que reduirien l'espai lliure per sota de %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>No hi ha prou espai en el servidor per a pujar-hi alguns fitxers.</translation> </message> @@ -5406,66 +5461,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6131,7 +6186,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6147,12 +6202,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_cs.ts b/translations/client_cs.ts index fa8a759ec..e00a8f08a 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>Zobrazit další akce</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>Zahodit</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>Otevřít dialog sdílení</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation>Soubor %1 už je uzamčeno %2.</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation>Operace uzamčení na %1 se nezdařila s chybou %2</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation>Operace odemčení na %1 se nezdařila s chybou %2</translation> </message> @@ -752,47 +752,47 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Odhlášeno</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Odpojeno</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Připojeno</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Služba nedostupná</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Režim údržby</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Chyba sítě</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Chyba v nastavení</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Dotazování na přihlašovací údaje</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Neznámý stav účtu</translation> </message> @@ -800,17 +800,17 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Více z aktivit si zobrazíte otevřením aplikace Aktivity</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation>Získávání aktivit</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Soubory ze seznamu ignorovaných a symbolické odkazy nejsou synchronizovány.</translation> </message> @@ -1588,7 +1588,7 @@ Opravdu chcete tyto změny provést i na serveru? Pokud to byla pouze chyba a chcete si tyto soubory ponechat, budou ze serveru znovu synchronizovány.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1599,7 +1599,7 @@ Pokud se rozhodnete soubory ponechat, budou opět synchronizovány se serverem, Pokud se rozhodnete soubory smazat, budou vám nedostupné, pokud nejste jejich vlastníkem.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1608,17 +1608,17 @@ Opravdu chcete tyto změny provést i na serveru? Pokud to byla pouze chyba a chcete si tyto soubory ponechat, budou ze serveru znovu synchronizovány.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Odebrat veškeré soubory?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Odebrat veškeré soubory</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Ponechat soubory</translation> </message> @@ -2501,7 +2501,7 @@ Položky u kterých je umožněno mazání budou smazány, pokud brání tomu, a <translation>Nový název souboru</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Přejmenovat soubor</translation> </message> @@ -2512,29 +2512,74 @@ Položky u kterých je umožněno mazání budou smazány, pokud brání tomu, a </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>Následující znaky nejsou systémem dovoleny: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>Nemáte potřebná práva k přejmenování souboru. Požádejte vlastníka souboru, aby ho přejmenoval.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>Název souboru obsahuje neplatné znaky: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Přejmenovat soubor se nepodařilo. Ujistěte se, že jste připojení k serveru.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Soubor není možné přejmenovat, protože soubor se stejným názvem na serveru už existuje. Vyberte jiný název.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3485,27 +3530,17 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>Název souboru začíná mezerami a nebylo ho možné přejmenovat, protože na serveru už existuje soubor se stejným názvem.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>Název souboru začíná mezerami a nebylo ho možné přejmenovat, protože lokálně už existuje soubor se stejným názvem.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Synchronizace nepodporuje symbolické odkazy.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Soubor je uveden na seznamu k ignorování.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Na tomto souborovém systému nejsou podporovány názvy souborů končící na tečku.</translation> </message> @@ -3515,62 +3550,72 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Názvy souborů obsahující znak „%1“ nejsou na tomto souborovém systému podporovány.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>Názvy souborů obsahující znak „%1“ nejsou na tomto souborovém systému podporovány.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Název souboru obsahuje přinejmenším jeden neplatný znak</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Název souboru je na tomto souborovém systému rezervovaným názvem (nelze ho použít).</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>Název souboru končí na mezery.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Název souboru je příliš dlouhý.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Soubor/složka je ignorovaná, protože je skrytá.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Zjištění existence (stat) se nezdařilo.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Konflikt: Stažena verze ze serveru, místní kopie přejmenována a nenahrána.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>Enkódování tohoto názvu souboru je mimo technické možnosti daného souborového systému.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>Takový název souboru je na serveru zařazen na seznam nepřípustných.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>Soubor má příponu vyhrazenou pro virtuální soubory.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>velikost</translation> </message> @@ -3580,27 +3625,37 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>oprávnění</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>server nahlásil žádné %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>oprávnění</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>identif. souboru</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>Název souboru začíná mezerami a nebylo ho možné přejmenovat, protože na serveru už existuje soubor se stejným názvem.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>Název souboru začíná mezerami a nebylo ho možné přejmenovat, protože lokálně už existuje soubor se stejným názvem.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>server nahlásil žádné %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>Server nahlášen číslo %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation>Není možné provést synchronizaci z důvodu neplatného času změny</translation> </message> @@ -3610,47 +3665,47 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Konflikt při nahrávání některých souborů do složky. Ty, které jsou v konfliktu budou vymazány!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Konflikt při nahrávání složky. Bude vymazána!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Konflikt při nahrávání souboru. Bude odebrán!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorováno podle nastavení „vybrat co synchronizovat“</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Neumožněno, protože nemáte oprávnění přidávat podsložky do této složky</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Neumožněno, protože nemáte oprávnění přidávat soubory do této složky</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Není možné tento soubor nahrát, protože je na serveru povoleno pouze čtení – obnovuje se</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Přesunuto do neplatného cíle – obnovuje se</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Odstranění není umožněno – obnovuje se</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Chyba při čtení databáze</translation> </message> @@ -3660,7 +3715,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Server vrátil chybu při čtení adresáře „%1“: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Server vrátil chybu při čtení adresáře „%1“: %2</translation> </message> @@ -4114,7 +4169,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Vybrat co synchronizovat</translation> </message> @@ -4142,13 +4197,13 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Velikost</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Na serveru momentálně nejsou žádné podsložky.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Došlo k chybě v průběhu načítání seznamu podsložek.</translation> </message> @@ -4156,12 +4211,12 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation>Odpovědět</translation> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Zamítnout</translation> </message> @@ -4208,11 +4263,6 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Popis umístění ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Ikona</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>štítek sdílení</translation> @@ -4223,6 +4273,11 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Popis umístění Nextcloud:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Ikona</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4402,27 +4457,27 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Smazat odkaz pro sdílení</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Potvrďte smazání odkazu pro sdílení</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Opravdu chcete smazat odkaz na veřejné sdílení <i>%1</i>?</p><p>Pozn.: tuto akci nelze vzít zpět.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Smazat</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Storno</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Veřejný odkaz</translation> </message> @@ -5151,12 +5206,12 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Kódování znaků v názvu souboru není platné</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Nedaří se číst ze žurnálu synchronizace.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Nedaří se otevřít synchronizační žurnál</translation> </message> @@ -5171,17 +5226,17 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Název souboru obsahuje přinejmenším jeden neplatný znak</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>V synchronizaci bude zakrátko navázáno.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Na disku dochází místo: Stahování které by zmenšilo volné místo pod %1 bude přeskočeno.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Na serveru není pro některé z nahrávaných souborů dostatek místa.</translation> </message> @@ -5444,66 +5499,66 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Nepodařilo se vyčistit zprávu stavu uživatele. Ověřte, že jste připojení k serveru.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Nečistit</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 minut</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 hodina</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 hodiny</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Dnes</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Tento týden</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Méně než minuty</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 minuta</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 minut</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 hodin</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 den</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 dny</translation> </message> @@ -6169,7 +6224,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Online</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>Označit jako přečtené</translation> </message> @@ -6185,12 +6240,12 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation>Odpovědět na</translation> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation>Odeslat odpověď na zprávu v chatu</translation> </message> diff --git a/translations/client_da.ts b/translations/client_da.ts index 694e57791..b606347d7 100644 --- a/translations/client_da.ts +++ b/translations/client_da.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -752,47 +752,47 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Logget ud</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Frakoblet</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Forbundet</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Service utilgængelig</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Vedligeholdelsestilstand</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Netværksfejl</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Konfigurationsfejl</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Forespørger om brugeroplysninger</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Ukendt konto tilstand</translation> </message> @@ -800,17 +800,17 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>For flere aktiviteter åbn Activity app'n.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Filer fra ignorerlisten såvel som symbolske links synkroniseres ikke.</translation> </message> @@ -1582,7 +1582,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1590,24 +1590,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -2488,7 +2488,7 @@ Elementer hvor sletning er tilladt vil blive slettet hvis de hindre en folder fr <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2499,29 +2499,74 @@ Elementer hvor sletning er tilladt vil blive slettet hvis de hindre en folder fr </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3462,27 +3507,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3492,62 +3527,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3557,27 +3602,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3587,47 +3642,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3637,7 +3692,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4091,7 +4146,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Vælg Hvad der skal Synkroniseres</translation> </message> @@ -4119,13 +4174,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Størrelse</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Ingen undermapper på serveren.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Der opstod en fejl ved indlæsning af listen af undermappe.</translation> </message> @@ -4133,12 +4188,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Afvis</translation> </message> @@ -4185,11 +4240,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud Sti:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Ikon</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>del mærke</translation> @@ -4200,6 +4250,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nextcloud Sti:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Ikon</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4379,27 +4434,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Slet delingslink</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Bekræft sletning af delt link</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Ønsker du virkelig at fjerne offentlig link deling <i>%1</i>?</p><p>Note: Denne handling kan ikke fortrydes.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Slet</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Annuller</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Offentligt link</translation> </message> @@ -5128,12 +5183,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Kodning af filnavn ikke gyldig</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Kunne ikke læse fra synkroniserings loggen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Kunne ikke åbne synkroniserings loggen</translation> </message> @@ -5148,17 +5203,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Filnavnet indeholder mindst ét ugyldigt tegn</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Diskplads begrænset: Downloads der bringer ledig plads under %1 ignoreres.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Der er utilstrækkelig plads på serveren til visse uploads.</translation> </message> @@ -5421,66 +5476,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6146,7 +6201,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6162,12 +6217,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_de.ts b/translations/client_de.ts index 4baebdd3b..2169f9cd5 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>Weitere Aktionen anzeigen</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>Ablehnen</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>Teilen-Dialog öffnen</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation>Datei %1 ist bereits von %2 gesperrt.</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation>Das Sperren von %1 ist mit Fehler %2 fehlgeschlagen</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation>Das Entsperren von %1 ist mit Fehler %2 fehlgeschlagen</translation> </message> @@ -752,47 +752,47 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Abgemeldet</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Getrennt</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Verbunden</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Dienst nicht verfügbar</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Wartungsmodus</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Netzwerkfehler</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Konfigurationsfehler</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Zugangsdaten werden abgefragt</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Unbekannter Konto-Zustand</translation> </message> @@ -800,17 +800,17 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Um weitere Aktivitäten anzusehen bitte die Activity-App öffnen.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation>Aktivitäten abrufen…</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Dateien aus der Ignorierliste sowie symbolische Links werden nicht synchronisiert.</translation> </message> @@ -1589,7 +1589,7 @@ Sind Sie sich sicher, dass Sie diese Aktion mit Ihrem Server synchronisieren mö Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheiden, werden diese wieder vom Server synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1600,7 +1600,7 @@ Wenn Sie sich entscheiden, die Dateien wiederherzustellen, werden sie erneut mit Wenn Sie sich entscheiden, die Dateien zu löschen, sind sie für Sie nicht mehr verfügbar, es sei denn, Sie sind der Eigentümer.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1609,17 +1609,17 @@ Sind Sie sich sicher, dass Sie diese Aktion mit Ihrem Server synchronisieren mö Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheiden, werden diese wieder vom Server synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Alle Dateien löschen?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Alle Dateien entfernen</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Dateien behalten</translation> </message> @@ -2502,7 +2502,7 @@ Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn diese das Lösch <translation>Neuer Dateiname</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Datei umbenennen</translation> </message> @@ -2513,29 +2513,74 @@ Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn diese das Lösch </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>Die folgenden Zeichen sind auf dem System nicht erlaubt: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>Sie haben nicht die Berechtigung, diese Datei umzubenennen. Bitte wenden Sie sich an den Autor der Datei, um sie umzubenennen.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>Dateiname enthält unzulässige Zeichen: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Datei konnte nicht umbenannt werden. Bitte stellen Sie sicher, dass Sie mit dem Server verbunden sind.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Die Datei kann nicht umbenannt werden, da eine Datei mit demselben Namen bereits auf dem Server existiert. Bitte wählen Sie einen anderen Namen.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3485,27 +3530,17 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>Datei enthält Leerzeichen am Ende und konnte nicht umbenannt werden, da eine Datei mit demselben Namen bereits auf dem Server existiert.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>Datei enthält Leerzeichen am Ende und konnte nicht umbenannt werden, da eine Datei mit demselben Namen bereits lokal existiert.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symbolische Verknüpfungen werden bei der Synchronisierung nicht unterstützt.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Die Datei ist in der Ignorierliste aufgeführt.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Dateinamen, die mit einem Punkt enden, werden von diesem Dateisystem nicht unterstützt.</translation> </message> @@ -3515,62 +3550,72 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Dateinamen, welche das Zeichen '%1' enthalten, werden von diesem Dateisystem nicht unterstützt.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>Dateinamen, welche das Zeichen "%1" enthalten, werden von diesem Dateisystem nicht unterstützt.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Der Dateiname enthält mindestens ein ungültiges Zeichen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Der Dateiname ist ein reservierter Name in diesem Dateisystem.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>Dateiname enthält Leerzeichen am Ende.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Der Dateiname ist zu lang.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Datei/Ordner wird ignoriert, weil sie unsichtbar ist.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Stat fehlgeschlagen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Konflikt: Serverversion heruntergeladen, lokale Kopie umbenannt und nicht hochgeladen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>Der Dateiname kann auf Ihrem Dateisystem nicht entschlüsselt werden.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>Der Dateiname steht auf dem Server auf einer schwarzen Liste.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>Die Endung der Datei ist für virtuelle Dateien reserviert.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>Größe</translation> </message> @@ -3580,27 +3625,37 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Berechtigungen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>Server meldet kein %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>Berechtigung</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>Datei-ID</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>Datei enthält Leerzeichen am Ende und konnte nicht umbenannt werden, da eine Datei mit demselben Namen bereits auf dem Server existiert.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>Datei enthält Leerzeichen am Ende und konnte nicht umbenannt werden, da eine Datei mit demselben Namen bereits lokal existiert.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>Server meldet kein %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>Server meldet keine %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation>Synchronisierung wegen ungültiger Änderungszeit nicht möglich</translation> </message> @@ -3610,47 +3665,47 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Konflikt beim Hochladen einiger Dateien in einen Ordner. Diejenigen, die in Konflikt stehen, werden gelöscht!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Konflikt beim Hochladen eines Ordners. Er wird gelöscht!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Konflikt beim Hochladen einer Datei. Sie wird entfernt!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignoriert wegen der "Choose what to sync"-Blacklist</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Nicht erlaubt, da Sie nicht die Berechtigung haben, Unterordner zu diesem Ordner hinzuzufügen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Nicht erlaubt, da Sie keine Berechtigung zum Hinzufügen von Dateien in diesen Ordner haben.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist. Wiederherstellen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Auf ungültiges Ziel verschoben, wiederherstellen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Entfernen nicht erlaubt, wiederherstellen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Fehler beim Lesen der Datenbank</translation> </message> @@ -3660,7 +3715,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Der Server hat während des Lesens des Verzeichnisses '%1' mit einem Fehler geantwortet: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Der Server hat während des Lesens des Verzeichnisses "%1" mit einem Fehler geantwortet: %2</translation> </message> @@ -4114,7 +4169,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Zu synchronisierende Elemente auswählen</translation> </message> @@ -4142,13 +4197,13 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Größe</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Aktuell befinden sich keine Unterordner auf dem Server.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Es ist ein Fehler während des Ladens der Liste der Unterordner aufgetreten.</translation> </message> @@ -4156,12 +4211,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation>Antworten</translation> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Ausblenden</translation> </message> @@ -4208,11 +4263,6 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Nextcloud-Pfad:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Symbol</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>Freigabe-Label</translation> @@ -4223,6 +4273,11 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Nextcloud-Pfad:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Symbol</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4402,27 +4457,27 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Freigabe-Link löschen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Löschen des öffentlichen Links bestätigen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Möchten Sie wirklich den öffentlichen Link <i>%1 </i>löschen?<p>Hinweis: Dies kann nicht rückgängig gemacht werden.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Löschen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Öffentlicher Link</translation> </message> @@ -5151,12 +5206,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Dateikodierung ist ungültig</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Fehler beim Einlesen des Synchronisierungsprotokolls.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Synchronisierungsprotokoll kann nicht geöffnet werden</translation> </message> @@ -5171,17 +5226,17 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Der Dateiname enthält mindestens ein ungültiges Zeichen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>Die Synchronisierung wird in Kürze fortgesetzt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Der freie Speicherplatz wird knapp: Downloads, die den freien Speicher unter %1 reduzieren, wurden ausgelassen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Auf dem Server ist für einige Dateien zum Hochladen nicht genug Platz.</translation> </message> @@ -5444,66 +5499,66 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Statusnachricht des Benutzers konnte nicht gelöscht werden. Stellen Sie bitte sicher, dass Sie mit dem Server verbunden sind.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Nicht löschen</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 Minuten</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 Stunde</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 Stunden</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Heute</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Diese Woche</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Weniger als eine Minute</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 Minute</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 Minuten</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 Stunden</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 Tag</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 Tage</translation> </message> @@ -6169,7 +6224,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Online</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>Als gelesen markieren</translation> </message> @@ -6185,12 +6240,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation>Antworten an …</translation> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation>Antwort auf Chat-Nachricht senden</translation> </message> diff --git a/translations/client_el.ts b/translations/client_el.ts index 37e467f14..f05d5136d 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -748,47 +748,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Αποσύνδεση</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Αποσυνδεδεμένο</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Συνδεδεμένο</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Η υπηρεσία δεν είναι διαθέσιμη</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Κατάσταση συντήρησης</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Σφάλμα δικτύου</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Σφάλμα ρυθμίσεων</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Ερώτηση πιστοποιητικών</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Άγνωστη κατάσταση λογαριασμού</translation> </message> @@ -796,17 +796,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Για εμφάνιση περισσότερων δραστηριοτήτων παρακαλώ ανοίξτε την εφαρμογή Activity.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Τα αρχεία από τη λίστα παράβλεψης καθώς και οι συμβολικοί σύνδεσμοι δεν συγχρονίζονται.</translation> </message> @@ -1578,7 +1578,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Όλα τα αρχεία στον τοπικό σας φάκελο συγχρονισμού '% 1' διαγράφησαν. Αυτές οι διαγραφές θα συγχρονιστούν με τον διακομιστή σας, καθιστώντας τα αρχεία αυτά μη διαθέσιμα εκτός αν γίνει επαναφορά. Είστε βέβαιοι ότι θέλετε να συγχρονίσετε αυτές τις ενέργειες με τον διακομιστή; Εάν αυτό ήταν ατύχημα και αποφασίσετε να διατηρήσετε τα αρχεία σας, θα συγχρονιστούν ξανά από το διακομιστή.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1589,7 +1589,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a Εφόσον επιλέξετε να διαγράψετε τα αρχεία, δε θα είναι διαθέσιμα σε εσάς, εκτός εάν είστε ο κάτοχος.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1598,17 +1598,17 @@ If this was an accident and you decide to keep your files, they will be re-synce Εάν έγινε λάθος και αποφασίσετε να διατηρήσετε τα αρχεία σας, θα συγχρονιστούν ξανά από το διακομιστή.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Κατάργηση όλων των αρχείων;</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Κατάργηση όλων των αρχείων.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Κράτησε τα αρχεία</translation> </message> @@ -2490,7 +2490,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>Νέο όνομα αρχείου</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Μετονομασία αρχείου</translation> </message> @@ -2501,29 +2501,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>Οι ακόλουθοι χαρακτήρες δεν επιτρέπονται στο σύστημα: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>Δεν έχετε τα απαραίτητα δικαιώματα για τη μετονομασία του αρχείου. Παρακαλούμε ρωτήστε τον κάτοχο του αρχείου να το μετονομάσει.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>Το όνομα αρχείου περιέχει μη αποδεκτούς χαρακτήρες: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Δεν είναι δυνατή η μετονομασία του αρχείου. Παρακαλούμε ελέγξτε τη σύνδεσή σας με το διακομιστή.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Δεν είναι δυνατή η μετονομασία του αρχείου καθώς χρησιμοποιείται ήδη στο διακομιστή. Παρακαλούμε επιλέξτε διαφορετικό.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3466,27 +3511,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Οι συμβολικοί σύνδεσμοι δεν υποστηρίζονται κατά το συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Το αρχείο παρατίθεται στη λίστα προς αγνόηση.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Τα ονόματα αρχείων που τελειώνουν με τελεία δεν υποστηρίζονται σε αυτό το σύστημα αρχείων.</translation> </message> @@ -3496,62 +3531,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Τα ονόματα αρχείων που περιέχουν τον χαρακτήρα '% 1' δεν υποστηρίζονται σε αυτό το σύστημα αρχείων.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Το όνομα αρχείου περιέχει τουλάχιστον έναν μη έγκυρο χαρακτήρα.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Το όνομα αρχείου είναι ένα δεσμευμένο όνομα σε αυτό το σύστημα αρχείων.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>Το όνομα αρχείου περιέχει κενά διαστήματα.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Το όνομα αρχείου είναι πολύ μακρύ.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Το αρχείο / φάκελος αγνοείται επειδή είναι κρυμμένο.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Το Stat απέτυχε.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Διένεξη: Λήψη έκδοσης διακομιστή, μετονομασία τοπικού αντιγράφου και μη μεταφόρτωση.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>Το όνομα αρχείου δεν μπορεί να κωδικοποιηθεί στο σύστημα αρχείων σας.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>Το όνομα αρχείου είναι στη μαύρη λίστα στον διακομιστή.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>Το αρχείο έχει επέκταση που προορίζεται για εικονικά αρχεία.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>μέγεθος</translation> </message> @@ -3561,27 +3606,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>άδειες</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>ο διακομιστής δεν ανέφερε %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>αναγνωριστκό αρχείου (id)</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>ο διακομιστής δεν ανέφερε %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3591,47 +3646,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Αγνοήθηκε λόγω της μαύρης λίστας "επιλέξτε τι να συγχρονίσετε".</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Δεν επιτρέπεται επειδή δεν έχετε άδεια να προσθέσετε υποφακέλους σε αυτόν το φάκελο.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Δεν επιτρέπεται επειδή δεν έχετε άδεια να προσθέσετε φακέλους σε αυτόν το φάκελο.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Δεν επιτρέπεται η μεταφόρτωση αυτού του αρχείου επειδή είναι μόνο για ανάγνωση στον διακομιστή, γίνεται επαναφορά.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Μετακινήθηκε σε μη έγκυρο στόχο, επαναφορά.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Δεν επιτρέπεται η κατάργηση, επαναφορά.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Σφάλμα κατά την ανάγνωση της βάσης δεδομένων.</translation> </message> @@ -3641,7 +3696,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ο διακομιστής απάντησε με σφάλμα κατά την ανάγνωση της διεύθυνσης ΄%1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4095,7 +4150,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Επιλέξτε Τι θα Συγχρονιστεί</translation> </message> @@ -4123,13 +4178,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Μέγεθος</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Δεν υπάρχουν υποφάκελοι αυτή τη στιγμή στον διακομιστή.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Παρουσιάστηκε σφάλμα κατά την φόρτωση της λίστας των υπο-φακέλων</translation> </message> @@ -4137,12 +4192,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Αποδέσμευση</translation> </message> @@ -4189,11 +4244,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Διαδρομή ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Εικονίδιο</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>Διαμοιρασμός ετικέτας</translation> @@ -4204,6 +4254,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nextcloud Διαδρομή:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Εικονίδιο</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4383,27 +4438,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Διαγραφή κοινόχρηστου συνδέσμου</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Επιβεβαίωση Διαγραφής Κοινόχρηστου Συνδέσμου</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Θέλετε σίγουρα να διαγράψετ τον δημόσιο σύνδεσμο κοινής χρήσης <i> %1</i>?</p><p>Σημείωση: Η ενέργεια δεν αναιρείται.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Διαγραφή</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Ακύρωση</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Δημόσιος σύνδεσμος</translation> </message> @@ -5132,12 +5187,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Αδυναμία ανάγνωσης από το ημερολόγιο συγχρονισμού.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation> </message> @@ -5152,17 +5207,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Ο χώρος δίσκου είναι χαμηλός: Οι λήψεις που θα μειώσουν τον ελέυθερο χώρο κάτω από %1 θα αγνοηθούν.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Μη αρκετός διαθέσιμος χώρος στον διακομιστή για μερικές μεταφορτώσεις.</translation> </message> @@ -5425,66 +5480,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Να μη γίνεται εκκαθάριση</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 λεπτά</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 ώρα</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 ώρες</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Σήμερα</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Αυτή την εβδομάδα</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Λιγότερο από ένα λεπτό</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 λεπτό</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 λεπτά</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 ώρες</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 ημέρα</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 ημέρες</translation> </message> @@ -6150,7 +6205,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Σε σύνδεση</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6166,12 +6221,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index 9f52ee2ad..4eac4b3aa 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Signed out</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Disconnected</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Connected</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Service unavailable</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Maintenance mode</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Network error</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Configuration error</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Asking Credentials</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Unknown account state</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1573,7 +1573,7 @@ Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1581,24 +1581,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Remove All Files?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Remove all files</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Keep files</translation> </message> @@ -2477,7 +2477,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2488,29 +2488,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3451,27 +3496,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3481,62 +3516,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3546,27 +3591,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3576,47 +3631,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3626,7 +3681,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4080,7 +4135,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Choose What to Sync</translation> </message> @@ -4108,13 +4163,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Size</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>No subfolders currently on the server.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>An error occurred while loading the list of sub folders.</translation> </message> @@ -4122,12 +4177,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Dismiss</translation> </message> @@ -4174,11 +4229,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud Path:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Icon</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>share label</translation> @@ -4189,6 +4239,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Icon</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4368,27 +4423,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirm Link Share Deletion</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Delete</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Public link</translation> </message> @@ -5117,12 +5172,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Filename encoding is not valid</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Unable to read from the sync journal.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Cannot open the sync journal</translation> </message> @@ -5137,17 +5192,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>File name contains at least one invalid character</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Disk space is low: Downloads that would reduce free space below %1 were skipped.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>There is insufficient space available on the server for some uploads.</translation> </message> @@ -5410,66 +5465,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6135,7 +6190,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6151,12 +6206,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_eo.ts b/translations/client_eo.ts index ba3c23993..85705a1ab 100644 --- a/translations/client_eo.ts +++ b/translations/client_eo.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Elsalutita</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Malkonektita</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Konektita</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servo nedisponebla</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Reĝimo de prizorgado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Reta eraro</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Agorda eraro</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Akreditiloj petitaj</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Konto-stato nekonita</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1581,7 +1581,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Se tio estis neintenca kaj se vi decidas gardi viajn dosierojn, ili estos resinkronigitaj el la servilo.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1589,24 +1589,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -2487,7 +2487,7 @@ Elementoj, kies forigo estas permesita, estos forigitaj, se ili malhelpas forigo <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2498,29 +2498,74 @@ Elementoj, kies forigo estas permesita, estos forigitaj, se ili malhelpas forigo </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3460,27 +3505,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3490,62 +3525,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3555,27 +3600,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3585,47 +3640,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3635,7 +3690,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4089,7 +4144,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Elekti tion, kion sinkronigi</translation> </message> @@ -4117,13 +4172,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Grando</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Ne estas subdosierujo nun en la servilo.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Eraro okazis dum ŝarĝado de la listo de subdosierujoj.</translation> </message> @@ -4131,12 +4186,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Ignori</translation> </message> @@ -4183,11 +4238,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud-vojo:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Piktogramo</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>kunhava etikedo</translation> @@ -4198,6 +4248,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nextcloud-vojo:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Piktogramo</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4377,27 +4432,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Forigi kunhavo-ligilon</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Konfirmi forigon de kunhava ligilo</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Ĉu vi ja volas forigi la kunhavigon per publika ligilo <i>%1</i>?</p><p>Notu: tio ne povas esti malfarita.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Forigi</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Nuligi</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Publika ligilo</translation> </message> @@ -5125,12 +5180,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Kodigi de dosiernomo ne validas</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Ne eblas legi el la sinkroniga protokolo.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Ne eblas malfermi la sinkronigan protokolon</translation> </message> @@ -5145,17 +5200,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>La dosiernomo enhavas almenaŭ unu nevalidan signon.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Diskospaco ne sufiĉas: elŝutoj, kiuj reduktos liberan spacon sub %1, ne okazis.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>La servilo ne plu havas sufiĉan spacon por iuj alŝutoj.</translation> </message> @@ -5418,66 +5473,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6143,7 +6198,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6159,12 +6214,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es.ts b/translations/client_es.ts index 9dd7da867..43893d4f6 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>Mostrar más acciones</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>Descartar</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>Abrir diálogo de compartir</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -752,47 +752,47 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Cerrar sesión</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servicio no disponible</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Modo mantenimiento</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Error en la red</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Error en la configuración</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Solicitando credenciales</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Estado de cuenta desconocido</translation> </message> @@ -800,17 +800,17 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Para más detalles, por favor, abre la app Actividades.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Los archivos de la lista de ignorados así como los enlace simbólicos no estarán sincronizados.</translation> </message> @@ -1590,7 +1590,7 @@ Esta eliminación será sincronizada con tu servidor, haciendo que esos archivos Si esto ha sido un accidente, y decides mantener tus archivos, serán re-sincronizados con el servidor.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1601,7 +1601,7 @@ Si decides restaurar los archivos, volverán a sincronizarse con el servidor si Si decides eliminar los archivos, ya no los tendrás disponibles, a no ser que seas el propietario.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1611,17 +1611,17 @@ Esta eliminación será sincronizada con tu servidor, haciendo que esos archivos Si esto ha sido un accidente, y decides mantener tus archivos, serán re-sincronizados desde el servidor.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>¿Eliminar todos los archivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Eliminar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Mantener archivos</translation> </message> @@ -2504,7 +2504,7 @@ Los elementos que se permite su borrado se eliminarán si impiden que un directo <translation>Nuevo nombre de archivo</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Renombrar archivo</translation> </message> @@ -2515,29 +2515,74 @@ Los elementos que se permite su borrado se eliminarán si impiden que un directo </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>Los siguientes caracteres no se permiten en el sistema: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>No tienes permisos para renombrar este archivo. Por favor, dile al autor del archivo que lo renombre.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>El nombre del archivo contiene caracteres ilegales: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>No se ha podido renombrar el archivo. Por favor, asegúrese de que está conectado al servidor.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>No se puede renombrar el archivo porque hay un archivo con el mismo nombre en el servidor. Por favor, elije otro nombre.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3487,27 +3532,17 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>El archivo contiene espacios al final y no puede ser renombrado porque ya existe un archivo con el mismo nombre en el servidor.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>El archivo contiene espacios al final y no puede ser renombrado porque ya existe localmente un archivo con el mismo nombre.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Los enlaces simbólicos no están soportados en la sincronización.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>El archivo está en la lista de ignorados.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Los nombres de archivo que terminan con un punto no son compatibles con este sistema de archivos.</translation> </message> @@ -3517,62 +3552,72 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Los nombres de archivo que contienen el carácter «%1» no son compatibles con este sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>Los nombres de archivo que contienen el carácter "%1" no son compatibles con este sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>El nombre del archivo contiene al menos un carácter no válido</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>El nombre del archivo es una palabra reservada del sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>El nombre del archivo contiene espacios finales.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>El nombre del archivo es demasiado largo.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>El archivo o carpeta es ignorado porque está oculto.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Stat ha fallado.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Conflicto: Versión del servidor descargada, la copia local ha sido renombrada pero no se ha podido subir.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>El nombre de archivo no se puede codificar en tu sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>El nombre del archivo está prohibido en el servidor.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>El archivo tiene una extensión reservada para archivos virtuales.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>tamaño</translation> </message> @@ -3582,27 +3627,37 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>permisos</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>el servidor informó de no %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>permisos</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>identificador de archivo</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>El archivo contiene espacios al final y no puede ser renombrado porque ya existe un archivo con el mismo nombre en el servidor.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>El archivo contiene espacios al final y no puede ser renombrado porque ya existe localmente un archivo con el mismo nombre.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>el servidor informó de no %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>El servidor informó de no %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3612,47 +3667,47 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Se ha producido un conflicto al subir algunos archivos a una carpeta. ¡Se eliminarán los conflictivos!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Se ha producido un conflicto al subir una carpeta. ¡Se eliminará!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Se ha producido un conflicto al subir un archivo. ¡Se eliminará!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorado porque se encuentra en la lista negra de «elija qué va a sincronizar»</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>No permitido porque no tienes permiso para añadir subcarpetas a esa carpeta.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>No permitido porque no tienes permiso para añadir archivos a esa carpeta.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Movido a un lugar no válido, restaurando</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>No está permitido borrar, restaurando</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Error mientras se leía la base de datos</translation> </message> @@ -3662,7 +3717,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>El servidor contestó con un error al leer el directorio «%1» : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>El servidor contestó con un error al leer el directorio "%1" : %2</translation> </message> @@ -4116,7 +4171,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Escoja qué sincronizar</translation> </message> @@ -4144,13 +4199,13 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Tamaño</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>No hay subcarpetas actualmente en el servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Se ha producido un error al cargar la lista de carpetas.</translation> </message> @@ -4158,12 +4213,12 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Descartar</translation> </message> @@ -4210,11 +4265,6 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Ruta de OwnCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Icono</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>Compartir etiqueta</translation> @@ -4225,6 +4275,11 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Ruta de Nextcloud:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Icono</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4404,27 +4459,27 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Eliminar enlace compartido</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar eliminación de enlace de recurso compartido</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>¿Realmente desea borrar el enlace público compartido <i>%1</i>?</p><p>Nota: Esta acción no se puede deshacer</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Enlace público</translation> </message> @@ -5153,12 +5208,12 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Los caracteres del nombre de fichero no son válidos</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>No se ha podido leer desde el registro de sincronización</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>No es posible abrir el diario de sincronización</translation> </message> @@ -5173,17 +5228,17 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Nombre de archivo contiene al menos un caracter no válido</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>La sincronización continuará en breves.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Poco espacio libre en disco: La descarga lo reducirá por debajo del %1, deberia abortar.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>No hay suficiente espacio libre en el servidor para algunas subidas.</translation> </message> @@ -5446,66 +5501,66 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>No se ha podido borrar el mensaje de estado del usuario. Asegúrese de que está conectado al servidor.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>No borrar</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 minutos</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 hora</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 horas</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Hoy</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Esta semana</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Hace menos de un minuto</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 minuto</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 minutos</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 horas</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 día</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 días</translation> </message> @@ -6171,7 +6226,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>Marcar como leído</translation> </message> @@ -6187,12 +6242,12 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts index ed16c891f..d39487d35 100644 --- a/translations/client_es_AR.ts +++ b/translations/client_es_AR.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Desautentificado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servicio no disponible</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Modo mantenimiento</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Error de red</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Error de configuración</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Pidiendo Credenciales</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Estado de la cuenta desconocido</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1563,7 +1563,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1571,24 +1571,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>¿Borrar todos los archivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Borrar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Conservar archivos</translation> </message> @@ -2465,7 +2465,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2476,29 +2476,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3436,27 +3481,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3466,62 +3501,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3531,27 +3576,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3561,47 +3616,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3611,7 +3666,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4065,7 +4120,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Elige </translation> </message> @@ -4093,13 +4148,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Tamaño</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation type="unfinished"/> </message> @@ -4107,12 +4162,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation type="unfinished"/> </message> @@ -4159,11 +4214,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation type="unfinished"/> @@ -4174,6 +4224,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4353,27 +4408,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation type="unfinished"/> </message> @@ -5100,12 +5155,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation type="unfinished"/> </message> @@ -5120,17 +5175,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> @@ -5393,66 +5448,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6118,7 +6173,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6134,12 +6189,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts index 7ddb09255..4f8e73ee3 100644 --- a/translations/client_es_CL.ts +++ b/translations/client_es_CL.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servicio no disponible</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Modo Mantenimiento</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Error de red</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Error de configuración</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Solicitando Credenciales</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Estado de la cuenta no conocido</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1570,7 +1570,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1578,24 +1578,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>¿Eliminar Todos los Archivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Eliminar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Mantener archivos</translation> </message> @@ -2472,7 +2472,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2483,29 +2483,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3444,27 +3489,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3474,62 +3509,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3539,27 +3584,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3569,47 +3624,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3619,7 +3674,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4073,7 +4128,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Elige qué sincronizar</translation> </message> @@ -4101,13 +4156,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Tamaño</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Actualmente no hay subcarpetas en el servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Se presentó un error al cargar la lista de sub carpetas. </translation> </message> @@ -4115,12 +4170,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Descartar</translation> </message> @@ -4167,11 +4222,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ruta de ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>compartir etiqueta</translation> @@ -4182,6 +4232,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4361,27 +4416,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>¿Realmente deseas borrar el vínculo público al elemento <i>%1</i>?</p> <p>Nota: Esta acción no se puede deshacer.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Liga pública</translation> </message> @@ -5110,12 +5165,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>No es posible leer desde el diario de sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> </message> @@ -5130,17 +5185,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Espacio en disco bajo: Las descargas que podrían reducir el espacio por debajo de %1 se omitieron.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>No hay espacio disponible en el servidor para algunas cargas.</translation> </message> @@ -5403,66 +5458,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6128,7 +6183,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6144,12 +6199,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts index c568f82fb..0472e7f70 100644 --- a/translations/client_es_CO.ts +++ b/translations/client_es_CO.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servicio no disponible</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Modo Mantenimiento</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Error de red</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Error de configuración</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Solicitando Credenciales</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Estado de la cuenta no conocido</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1570,7 +1570,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1578,24 +1578,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>¿Eliminar Todos los Archivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Eliminar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Mantener archivos</translation> </message> @@ -2472,7 +2472,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2483,29 +2483,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3444,27 +3489,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3474,62 +3509,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3539,27 +3584,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3569,47 +3624,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3619,7 +3674,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4073,7 +4128,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Elige qué sincronizar</translation> </message> @@ -4101,13 +4156,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Tamaño</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Actualmente no hay subcarpetas en el servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Se presentó un error al cargar la lista de sub carpetas. </translation> </message> @@ -4115,12 +4170,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Descartar</translation> </message> @@ -4167,11 +4222,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ruta de ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>compartir etiqueta</translation> @@ -4182,6 +4232,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4361,27 +4416,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>¿Realmente deseas borrar el vínculo público al elemento <i>%1</i>?</p> <p>Nota: Esta acción no se puede deshacer.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Liga pública</translation> </message> @@ -5110,12 +5165,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>No es posible leer desde el diario de sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> </message> @@ -5130,17 +5185,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Espacio en disco bajo: Las descargas que podrían reducir el espacio por debajo de %1 se omitieron.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>No hay espacio disponible en el servidor para algunas cargas.</translation> </message> @@ -5403,66 +5458,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6128,7 +6183,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6144,12 +6199,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts index 43d13b46b..1be68c593 100644 --- a/translations/client_es_CR.ts +++ b/translations/client_es_CR.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servicio no disponible</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Modo Mantenimiento</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Error de red</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Error de configuración</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Solicitando Credenciales</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Estado de la cuenta no conocido</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1570,7 +1570,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1578,24 +1578,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>¿Eliminar Todos los Archivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Eliminar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Mantener archivos</translation> </message> @@ -2472,7 +2472,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2483,29 +2483,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3444,27 +3489,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3474,62 +3509,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3539,27 +3584,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3569,47 +3624,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3619,7 +3674,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4073,7 +4128,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Elige qué sincronizar</translation> </message> @@ -4101,13 +4156,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Tamaño</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Actualmente no hay subcarpetas en el servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Se presentó un error al cargar la lista de sub carpetas. </translation> </message> @@ -4115,12 +4170,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Descartar</translation> </message> @@ -4167,11 +4222,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ruta de ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>compartir etiqueta</translation> @@ -4182,6 +4232,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4361,27 +4416,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>¿Realmente deseas borrar el vínculo público al elemento <i>%1</i>?</p> <p>Nota: Esta acción no se puede deshacer.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Liga pública</translation> </message> @@ -5110,12 +5165,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>No es posible leer desde el diario de sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> </message> @@ -5130,17 +5185,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Espacio en disco bajo: Las descargas que podrían reducir el espacio por debajo de %1 se omitieron.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>No hay espacio disponible en el servidor para algunas cargas.</translation> </message> @@ -5403,66 +5458,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6128,7 +6183,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6144,12 +6199,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts index 561241808..96045c438 100644 --- a/translations/client_es_DO.ts +++ b/translations/client_es_DO.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servicio no disponible</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Modo Mantenimiento</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Error de red</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Error de configuración</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Solicitando Credenciales</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Estado de la cuenta no conocido</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1570,7 +1570,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1578,24 +1578,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>¿Eliminar Todos los Archivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Eliminar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Mantener archivos</translation> </message> @@ -2472,7 +2472,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2483,29 +2483,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3444,27 +3489,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3474,62 +3509,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3539,27 +3584,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3569,47 +3624,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3619,7 +3674,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4073,7 +4128,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Elige qué sincronizar</translation> </message> @@ -4101,13 +4156,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Tamaño</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Actualmente no hay subcarpetas en el servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Se presentó un error al cargar la lista de sub carpetas. </translation> </message> @@ -4115,12 +4170,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Descartar</translation> </message> @@ -4167,11 +4222,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ruta de ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>compartir etiqueta</translation> @@ -4182,6 +4232,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4361,27 +4416,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>¿Realmente deseas borrar el vínculo público al elemento <i>%1</i>?</p> <p>Nota: Esta acción no se puede deshacer.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Liga pública</translation> </message> @@ -5110,12 +5165,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>No es posible leer desde el diario de sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> </message> @@ -5130,17 +5185,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Espacio en disco bajo: Las descargas que podrían reducir el espacio por debajo de %1 se omitieron.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>No hay espacio disponible en el servidor para algunas cargas.</translation> </message> @@ -5403,66 +5458,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6128,7 +6183,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6144,12 +6199,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts index 1a30dd096..89504b504 100644 --- a/translations/client_es_EC.ts +++ b/translations/client_es_EC.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servicio no disponible</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Modo Mantenimiento</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Error de red</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Error de configuración</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Solicitando Credenciales</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Estado de la cuenta no conocido</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1570,7 +1570,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1578,24 +1578,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>¿Eliminar Todos los Archivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Eliminar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Mantener archivos</translation> </message> @@ -2472,7 +2472,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2483,29 +2483,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3444,27 +3489,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3474,62 +3509,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3539,27 +3584,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3569,47 +3624,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3619,7 +3674,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4073,7 +4128,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Elige qué sincronizar</translation> </message> @@ -4101,13 +4156,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Tamaño</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Actualmente no hay subcarpetas en el servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Se presentó un error al cargar la lista de sub carpetas. </translation> </message> @@ -4115,12 +4170,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Descartar</translation> </message> @@ -4167,11 +4222,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ruta de ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>compartir etiqueta</translation> @@ -4182,6 +4232,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4361,27 +4416,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>¿Realmente deseas borrar el vínculo público al elemento <i>%1</i>?</p> <p>Nota: Esta acción no se puede deshacer.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Liga pública</translation> </message> @@ -5110,12 +5165,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>No es posible leer desde el diario de sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> </message> @@ -5130,17 +5185,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Espacio en disco bajo: Las descargas que podrían reducir el espacio por debajo de %1 se omitieron.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>No hay espacio disponible en el servidor para algunas cargas.</translation> </message> @@ -5403,66 +5458,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6128,7 +6183,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6144,12 +6199,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts index 0a9e85e0d..b5866af56 100644 --- a/translations/client_es_GT.ts +++ b/translations/client_es_GT.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servicio no disponible</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Modo Mantenimiento</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Error de red</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Error de configuración</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Solicitando Credenciales</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Estado de la cuenta no conocido</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1570,7 +1570,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1578,24 +1578,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>¿Eliminar Todos los Archivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Eliminar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Mantener archivos</translation> </message> @@ -2472,7 +2472,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2483,29 +2483,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3444,27 +3489,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3474,62 +3509,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3539,27 +3584,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3569,47 +3624,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3619,7 +3674,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4073,7 +4128,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Elige qué sincronizar</translation> </message> @@ -4101,13 +4156,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Tamaño</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Actualmente no hay subcarpetas en el servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Se presentó un error al cargar la lista de sub carpetas. </translation> </message> @@ -4115,12 +4170,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Descartar</translation> </message> @@ -4167,11 +4222,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ruta de ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>compartir etiqueta</translation> @@ -4182,6 +4232,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4361,27 +4416,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>¿Realmente deseas borrar el vínculo público al elemento <i>%1</i>?</p> <p>Nota: Esta acción no se puede deshacer.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Liga pública</translation> </message> @@ -5110,12 +5165,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>No es posible leer desde el diario de sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> </message> @@ -5130,17 +5185,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Espacio en disco bajo: Las descargas que podrían reducir el espacio por debajo de %1 se omitieron.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>No hay espacio disponible en el servidor para algunas cargas.</translation> </message> @@ -5403,66 +5458,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6128,7 +6183,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6144,12 +6199,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts index 1fa100ba9..ddbf0e361 100644 --- a/translations/client_es_HN.ts +++ b/translations/client_es_HN.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servicio no disponible</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Modo Mantenimiento</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Error de red</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Error de configuración</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Solicitando Credenciales</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Estado de la cuenta no conocido</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1570,7 +1570,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1578,24 +1578,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>¿Eliminar Todos los Archivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Eliminar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Mantener archivos</translation> </message> @@ -2472,7 +2472,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2483,29 +2483,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3444,27 +3489,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3474,62 +3509,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3539,27 +3584,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3569,47 +3624,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3619,7 +3674,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4073,7 +4128,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Elige qué sincronizar</translation> </message> @@ -4101,13 +4156,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Tamaño</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Actualmente no hay subcarpetas en el servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Se presentó un error al cargar la lista de sub carpetas. </translation> </message> @@ -4115,12 +4170,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Descartar</translation> </message> @@ -4167,11 +4222,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ruta de ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>compartir etiqueta</translation> @@ -4182,6 +4232,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4361,27 +4416,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>¿Realmente deseas borrar el vínculo público al elemento <i>%1</i>?</p> <p>Nota: Esta acción no se puede deshacer.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Liga pública</translation> </message> @@ -5110,12 +5165,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>No es posible leer desde el diario de sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> </message> @@ -5130,17 +5185,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Espacio en disco bajo: Las descargas que podrían reducir el espacio por debajo de %1 se omitieron.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>No hay espacio disponible en el servidor para algunas cargas.</translation> </message> @@ -5403,66 +5458,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6128,7 +6183,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6144,12 +6199,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts index 9475db7ec..d24b36ec3 100644 --- a/translations/client_es_MX.ts +++ b/translations/client_es_MX.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servicio no disponible</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Modo Mantenimiento</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Error de red</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Error de configuración</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Solicitando Credenciales</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Estado de la cuenta no conocido</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1570,7 +1570,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1578,24 +1578,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>¿Eliminar Todos los Archivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Eliminar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Mantener archivos</translation> </message> @@ -2472,7 +2472,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2483,29 +2483,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3444,27 +3489,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3474,62 +3509,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3539,27 +3584,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3569,47 +3624,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3619,7 +3674,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4073,7 +4128,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Elige qué sincronizar</translation> </message> @@ -4101,13 +4156,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Tamaño</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Actualmente no hay subcarpetas en el servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Se presentó un error al cargar la lista de sub carpetas. </translation> </message> @@ -4115,12 +4170,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Descartar</translation> </message> @@ -4167,11 +4222,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ruta de ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>compartir etiqueta</translation> @@ -4182,6 +4232,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4361,27 +4416,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>¿Realmente deseas borrar el vínculo público al elemento <i>%1</i>?</p> <p>Nota: Esta acción no se puede deshacer.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Liga pública</translation> </message> @@ -5110,12 +5165,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>No es posible leer desde el diario de sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> </message> @@ -5130,17 +5185,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Espacio en disco bajo: Las descargas que podrían reducir el espacio por debajo de %1 se omitieron.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>No hay espacio disponible en el servidor para algunas cargas.</translation> </message> @@ -5403,66 +5458,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6128,7 +6183,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6144,12 +6199,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts index f5d34fbab..8510a4967 100644 --- a/translations/client_es_SV.ts +++ b/translations/client_es_SV.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servicio no disponible</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Modo Mantenimiento</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Error de red</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Error de configuración</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Solicitando Credenciales</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Estado de la cuenta no conocido</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1570,7 +1570,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1578,24 +1578,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>¿Eliminar Todos los Archivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Eliminar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Mantener archivos</translation> </message> @@ -2472,7 +2472,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2483,29 +2483,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3444,27 +3489,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3474,62 +3509,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3539,27 +3584,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3569,47 +3624,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3619,7 +3674,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4073,7 +4128,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Elige qué sincronizar</translation> </message> @@ -4101,13 +4156,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Tamaño</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Actualmente no hay subcarpetas en el servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Se presentó un error al cargar la lista de sub carpetas. </translation> </message> @@ -4115,12 +4170,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Descartar</translation> </message> @@ -4167,11 +4222,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ruta de ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>compartir etiqueta</translation> @@ -4182,6 +4232,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4361,27 +4416,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar el Borrado de la Liga del Elemento Compartido</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>¿Realmente deseas borrar el vínculo público al elemento <i>%1</i>?</p> <p>Nota: Esta acción no se puede deshacer.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Liga pública</translation> </message> @@ -5110,12 +5165,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>No es posible leer desde el diario de sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> </message> @@ -5130,17 +5185,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Espacio en disco bajo: Las descargas que podrían reducir el espacio por debajo de %1 se omitieron.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>No hay espacio disponible en el servidor para algunas cargas.</translation> </message> @@ -5403,66 +5458,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6128,7 +6183,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6144,12 +6199,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_et.ts b/translations/client_et.ts index ced4d27e1..ac51715d8 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Välja logitud</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Lahti ühendatud</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Ühendatud</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Teenus pole saadaval</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Võrgu viga</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Seadistamise tõrge</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Tundmatu konto olek</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1563,7 +1563,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1571,24 +1571,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Kustutada kõik failid?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Kustutada kõik failid</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Säilita failid</translation> </message> @@ -2465,7 +2465,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2476,29 +2476,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3436,27 +3481,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3466,62 +3501,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3531,27 +3576,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3561,47 +3616,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3611,7 +3666,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4065,7 +4120,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Vali, mida sünkroniseerida</translation> </message> @@ -4093,13 +4148,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Suurus</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Serveris pole praegu alamkaustasid.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation type="unfinished"/> </message> @@ -4107,12 +4162,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Jäta vahele</translation> </message> @@ -4159,11 +4214,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloudi kaust:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>jagamise silt</translation> @@ -4174,6 +4224,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4353,27 +4408,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Kustuta jagamise link</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Kustuta</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Loobu</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Avalik link</translation> </message> @@ -5102,12 +5157,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Failinime kodeering pole kehtiv</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Ei suuda avada sünkroniseeringu zurnaali</translation> </message> @@ -5122,17 +5177,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Faili nimesonvähemalt üks keelatud märk</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> @@ -5395,66 +5450,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6120,7 +6175,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6136,12 +6191,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_eu.ts b/translations/client_eu.ts index 83a021d85..280a28010 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>Erakutsi ekintza gehiago</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>Baztertu</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>Ireki partekatzeko elkarrizketa-koadroa</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -752,47 +752,47 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Saioa bukatuta</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Deskonektatuta</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Konektatuta</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Zerbitzua ez dago eskuragarri</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Mantenu lanetan</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Sare errorea</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Konfigurazio errorea</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Kredentzialak eskatzen</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Kontuaren egoera ezezaguna</translation> </message> @@ -800,17 +800,17 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Jarduera gehiagorako ireki Jarduerak aplikazioa.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Ez ikusi zerrendako fitxategiak eta esteka sinbolikoak ez dira sinkronizatuko.</translation> </message> @@ -1590,7 +1590,7 @@ Ziur zaude ekintza hauek zerbitzarian sinkronizatu nahi dituzula? Ezabaketa nahigabea izan bada eta erabakitzen baduzu fitxategiok mantentzea, hauek zerbitzarian ber-sinkronizatuko dira.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1601,7 +1601,7 @@ Fitxategiak leheneratzea erabakitzen baduzu, berriro sinkronizatuko dira zerbitz Fitxategiak ezabatzea erabakitzen baduzu, ezingo dituzu erabilgarri izan, jabea ez bazara behintzat.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1610,17 +1610,17 @@ Ziur zaude ekintza horiek zerbitzariarekin sinkronizatu nahi dituzula? Istripua izan bada eta zure fitxategiak mantentzea erabakitzen baduzu, zerbitzaritik berriro sinkronizatuko dira.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Ezabatu fitxategi guztiak?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Ezabatu fitxategi guztiak</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Mantendu fitxategiak</translation> </message> @@ -2503,7 +2503,7 @@ Ezabatu daitezkeen elementuak ezabatu egingo dira karpeta bat ezabatzea ekiditen <translation>Fitxategi-izen berria</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Berrizendatu fitxategia</translation> </message> @@ -2514,29 +2514,74 @@ Ezabatu daitezkeen elementuak ezabatu egingo dira karpeta bat ezabatzea ekiditen </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>Hurrengo karaktereak ez daude sisteman onartuta: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>Ez duzu baimenik fitxategi hau berrizendatzeko. Mesedez, eskatu fitxategiaren jabeari berrizendatzeko.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>Fitxategiak karaktere ilegalak dauzka: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Ezin izan da fitxategia berrizendatu. Mesedez egiaztatu zerbitzarira konektatuta zaudela.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Ezin da fitxategia berrizendatu izen berdina duen fitxategi bat existitzen delako zerbitzarian dagoeneko. Mesedez, aukeratu beste izen bat.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3486,27 +3531,17 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>Fitxategiak zuriuneak ditu eta ezin izan da berrizendatu, izen berdina duen fitxategi bat zerbitzarian existitzen delako dagoeneko.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>Fitxategiak zuriuneak ditu eta ezin izan da berrizendatu, izen berdina duen fitxategi bat existitzen delako lokalean dagoeneko.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Esteka sinbolikoak ezin dira sinkronizatu.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Fitxategia baztertutakoen zerrendan dago.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Puntu batekin amaitzen diren fitxategi-izenak ez dira onartzen fitxategi-sistema honetan.</translation> </message> @@ -3516,62 +3551,72 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>'%1' karakterea daukaten fitxategi-izenak ez dira onartzen fitxategi-sistema honetan.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>"%1" karakterea daukaten fitxategi-izenak ez dira onartzen fitxategi-sistema honetan.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Fitxategi izenak behintzat baliogabeko karaktere bat du</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Fitxategi-izena izen erreserbatua da fitxategi-sistema honetan.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>Fitxategi-izenak amaierako zuriunea dauka.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Fitxategiaren izena luzeegia da.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Fitxategia/Karpeta ez da ikusi ezkutuan dagoelako.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Hasierak huts egin du.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Gatazka: zerbitzari bertsioa deskargatu da, kopia lokala berrizendatua eta ez igoa.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>Fitxategi-izen hori ezin da kodetu fitxategi-sistema honetan.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>Fitxategiaren izena zerrenda beltzean dago zerbitzarian.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>Fitxategiak fitxategi birtualentzako gordetako luzapena du.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>tamaina</translation> </message> @@ -3581,27 +3626,37 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>baimenak</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>zerbitzariak ez du %1-rik jakinarazi</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>baimena</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>fitxategiaren id-a</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>Fitxategiak zuriuneak ditu eta ezin izan da berrizendatu, izen berdina duen fitxategi bat zerbitzarian existitzen delako dagoeneko.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>Fitxategiak zuriuneak ditu eta ezin izan da berrizendatu, izen berdina duen fitxategi bat existitzen delako lokalean dagoeneko.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>zerbitzariak ez du %1-rik jakinarazi</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>Zerbitzariak ez du %1-rik jakinarazi</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation>Ezin da sinkronizatu aldaketa-ordu baliogabea delako</translation> </message> @@ -3611,47 +3666,47 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Gatazka gertatu da fitxategi batzuk karpetara kargatzean. Gatazka sortu dutenak garbitu egingo dira!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Gatazka gertatu da karpeta kargatzean. Garbituko da!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Gatazka gertatu da fitxategia kargatzean. Garbituko da!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ez ikusi egin zaio, "aukeratu zer sinkronizatu" zerrenda beltzagatik.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Ez da onartu, ez daukazulako baimenik karpeta horretan azpikarpetak gehitzeko</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Ez da onartu, ez daukazulako baimenik karpeta horretan fitxategiak gehitzeko</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Ez dago baimenik fitxategi hau kargatzek zerbitzarian irakurtzeko soilik delako, leheneratzen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Baliogabeko helburura mugitu da, berrezartzen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Ezabatzeko baimenik gabe, berrezartzen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Errorea datu-basea irakurtzean</translation> </message> @@ -3661,7 +3716,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Zerbitzariak errore batekin erantzun du '%1' direktorioa irakurtzean: %2 </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Zerbitzariak errore batekin erantzun du "%1" direktorioa irakurtzean: % 2</translation> </message> @@ -4115,7 +4170,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Hautatu zer sinkronizatu</translation> </message> @@ -4143,13 +4198,13 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Tamaina</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Ez dago azpikarpetarik zerbitzarian.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Errore bat gertatu da azpikarpeten zerrenda kargatzerakoan.</translation> </message> @@ -4157,12 +4212,12 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation>Erantzun</translation> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Baztertu</translation> </message> @@ -4209,11 +4264,6 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>ownCloud-en bidea:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Ikonoa</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>partekatu etiketa</translation> @@ -4224,6 +4274,11 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Nextcloud-en bidea:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Ikonoa</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4403,27 +4458,27 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Ezabatu partekatze esteka</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Baieztatu partekatze estekaren ezabaketa</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Ziur zaude <i>%1</i>esteka publikoaren partekatzea ezabatu nahi duzula?</p><p>Oharra: Ekintza hau ezin da desegin.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Ezabatu</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Utzi</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Esteka publikoa</translation> </message> @@ -5152,12 +5207,12 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Fitxategiaren kodeketa baliogabea da</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Ezin izan da sinkronizazio-egunkaria irakurri.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Ezin da sinkronizazio egunerokoa ireki</translation> </message> @@ -5172,17 +5227,17 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Fitxategi izenak behintzat baliogabeko karaktere bat du</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>Sinkronizazioak laster jarraituko du.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Toki gutxi dago diskoan: toki librea %1 azpitik gutxituko zuten deskargak saltatu egin dira.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Ez dago nahiko toki erabilgarririk zerbitzarian hainbat kargatarako.</translation> </message> @@ -5445,66 +5500,66 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Ezin izan da garbitu erabiltzailearen egoera mezua. Ziurtatu zerbitzarira konektatuta zaudela.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Ez garbitu</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 minutu</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>Ordu 1</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 ordu</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Gaur</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Aste honetan</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Minutu bat baino gutxiago</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>Minutu 1</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 minutu</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 ordu</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>Egun 1</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 egun</translation> </message> @@ -6170,7 +6225,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Linean</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>Markatu irakurri gisa</translation> </message> @@ -6186,12 +6241,12 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation>Erantzun honi ...</translation> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation>Bidali erantzuna txat-mezuari</translation> </message> diff --git a/translations/client_fa.ts b/translations/client_fa.ts index 6ccaa058f..a35359e81 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>خارج شد</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>قطع شده</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>متصل</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>سرویس خارج از دسترس</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>حالت تعمیر</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>خطای شبکه</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>خطای پیکربندی</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>درخواست مجوزها</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>وضعیت حساب ناشناخته</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1569,7 +1569,7 @@ If this was an accident and you decide to keep your files, they will be re-synce اگر این یک اتفاق بوده و شما تصمیم دارید پرونده هایتان را نگه دارید، آن ها از سرور مجددا همگام سازی خواهند شد.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1577,24 +1577,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>حذف تمام فایل ها؟</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>حذف تمام فایل ها</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>نگه داشتن فایل ها</translation> </message> @@ -2471,7 +2471,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2482,29 +2482,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3442,27 +3487,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3472,62 +3507,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3537,27 +3582,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3567,47 +3622,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3617,7 +3672,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4071,7 +4126,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>انتخاب موارد همگامسازی</translation> </message> @@ -4099,13 +4154,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>اندازه</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>هیچ زیر پوشه ای در حال حاضر در سرور وجود ندارد.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>هنگام بارگذاری فهرست زیر پوشه ها خطایی روی داد.</translation> </message> @@ -4113,12 +4168,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>پنهان کن</translation> </message> @@ -4165,11 +4220,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>مسیر ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>آیکون</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>اشتراکگذاری برچسب</translation> @@ -4180,6 +4230,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>آیکون</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4359,27 +4414,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>پیوند اشتراک را حذف کنید</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>حذف اشتراک گذاری لینک را تایید کنید</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>آیا شما واقعا می خواهید اشتراک لینک عمومی را حذف کنید<i>1%</i>؟</p><p> توجه: این عمل نمی تواند انجام نشود.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>حذف</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>لغو</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>پیوند عمومی</translation> </message> @@ -5107,12 +5162,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>رمزگذاری نام فایل معتبر نیست</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>نمی توان از مجله همگام ساز خواند.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>نمی توان مجله همگام ساز را باز کرد</translation> </message> @@ -5127,17 +5182,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>نام فایل دارای حداقل یک کاراکتر نامعتبر است</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>فضای دیسک کم است: دانلودهایی که فضای آزاد را به کمتر از 1% کاهش می دهند رد می شوند.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>برای بعضی از بارگذاری ها در سرور فضای کافی موجود نیست.</translation> </message> @@ -5400,66 +5455,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6125,7 +6180,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6141,12 +6196,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_fi.ts b/translations/client_fi.ts index de2e88f80..3d39740ff 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>Näytä lisää toimintoja</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>Hylkää</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>Avaa jakoikkuna</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -751,47 +751,47 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Kirjauduttu ulos</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Yhteys katkaistu</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Yhdistetty</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Palvelu ei ole käytettävissä</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Huoltotila</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Verkkovirhe</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Asetusvirhe</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Kysytään tilitietoja</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Tuntematon tilin tila</translation> </message> @@ -799,17 +799,17 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Lisää tapahtumia löydät Tapahtumat-sovelluksesta.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Symbolisia linkkejä ja tiedostoja, jotka ovat ohitettavien tiedostojen listalla, ei synkronoida.</translation> </message> @@ -1572,7 +1572,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1580,24 +1580,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Poistetaanko kaikki tiedostot?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Poista kaikki tiedostot</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Pidä tiedostot</translation> </message> @@ -2478,7 +2478,7 @@ Kohteet, joissa poisto on sallittu, poistetaan, jos ne estävät kansion poistam <translation>Uusi tiedostonimi</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Nimeä tiedosto uudelleen</translation> </message> @@ -2489,29 +2489,74 @@ Kohteet, joissa poisto on sallittu, poistetaan, jos ne estävät kansion poistam </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>Seuraavia merkkejä ei hyväksytä järjestelmässä: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>Sinulla ei ole käyttöoikeutta tämän tiedoston uudelleennimeämiseen. Pyydä tiedoston omistajaa nimeämään se uudelleen.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>Tiedostonimi sisältää kiellettyjä merkkejä: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Tiedostoa ei voitu nimetä uudelleen. Varmista, että olet yhteydessä palvelimeen.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Tiedostoa ei voitu nimetä uudelleen, koska saman niminen tiedosto on jo palvelimella. Valitse uusi nimi.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3450,27 +3495,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symboliset linkit eivät ole tuettuja synkronoinnissa.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3480,62 +3515,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Tiedoston nimi sisältää ainakin yhden virheellisen merkin</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Tiedoston nimi on liian pitkä.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Tiedosto/kansio ohitetaan, koska se on piilotettu.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Stat epäonnistui.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>koko</translation> </message> @@ -3545,27 +3590,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>oikeudet</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>tiedoston id</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3575,47 +3630,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Ei sallittu, koska oikeutesi eivät riitä alikansioiden lisäämiseen kyseiseen kansioon</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Ei sallittu, koska käyttöoikeutesi eivät riitä tiedostojen lisäämiseen kyseiseen kansioon</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Virhe tietokantaa luettaessa</translation> </message> @@ -3625,7 +3680,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4079,7 +4134,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Valitse synkronoitavat tiedot</translation> </message> @@ -4107,13 +4162,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Koko</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Palvelimella ei ole alihakemistoja juuri nyt.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Alikansioluetteloa ladatessa tapahtui virhe.</translation> </message> @@ -4121,12 +4176,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Hylkää</translation> </message> @@ -4173,11 +4228,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud-polku:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Kuvake</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation type="unfinished"/> @@ -4188,6 +4238,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nextcloud-polku:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Kuvake</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4367,27 +4422,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Poista jakolinkki</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Vahvista linkkijaon poistaminen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Poista</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Peruuta</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Julkinen linkki</translation> </message> @@ -5116,12 +5171,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Tiedostonimen merkistökoodaus ei ole kelvollista</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation type="unfinished"/> </message> @@ -5136,17 +5191,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Tiedoston nimi sisältää ainakin yhden virheellisen merkin</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Levytila on vähissä. Lataukset, jotka pienentäisivät tilaa alle %1 ohitettiin.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Palvelimella on liian vähän tilaa joillekin latauksille.</translation> </message> @@ -5409,66 +5464,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Älä tyhjennä</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 minuuttia</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 tunti</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 tuntia</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Tänään</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Tämä viikko</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Alle minuutti</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 minuutti</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 minuuttia</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 tuntia</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 päivä</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 päivää</translation> </message> @@ -6134,7 +6189,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Online</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6150,12 +6205,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 1dd45233f..140481dc9 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>Afficher plus d'actions</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>Ignorer</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>Ouvrir la boîte de dialogue de partage</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation>Le fichier %1 est déjà verrouillé par %2.</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation>L'opération de verrouillage de %1 a échoué avec l'erreur %2</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation>L'opération de déverrouillage de %1 a échoué avec l'erreur %2</translation> </message> @@ -750,47 +750,47 @@ Vous prenez vos propres risques.</translation> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Session fermée</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Déconnecté</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Connecté</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Service indisponible</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>mode maintenance</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Erreur réseau</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Erreur de configuration</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>informations d'identification demandées</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Etat du compte inconnu</translation> </message> @@ -798,17 +798,17 @@ Vous prenez vos propres risques.</translation> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Pour plus d'activités veuillez lancer l'application Activité.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation>Rapatriement des activités ...</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Les fichiers présents dans la liste d'exclusion ainsi que les liens symboliques ne sont pas synchronisés.</translation> </message> @@ -1588,7 +1588,7 @@ If this was an accident and you decide to keep your files, they will be re-synce S'il s'agissait d'un accident et que vous choisissiez de conserver vos fichiers, ils seront synchronisés à nouveau depuis le serveur.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1599,7 +1599,7 @@ Si vous décidez de garder ces fichiers, ils seront resynchronisés avec le serv Si vous décidez de supprimer ces fichiers, ils ne vous seront plus accessibles à moins que vous en soyez le propriétaire.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1608,17 +1608,17 @@ If this was an accident and you decide to keep your files, they will be re-synce S'il s'agissait d'un accident et que vous choisissiez de conserver vos fichiers, ils seront synchronisés à nouveau depuis le serveur.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Supprimer tous les fichiers ?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Supprimer tous les fichiers</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Conserver les fichiers</translation> </message> @@ -2501,7 +2501,7 @@ Les éléments ayant l'option "Autoriser la suppression" pourront <translation>Nouveau nom de fichier</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Renommer le fichier</translation> </message> @@ -2512,29 +2512,74 @@ Les éléments ayant l'option "Autoriser la suppression" pourront </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>Les caractères suivants ne sont pas supportés par votre système : * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>Vous n'avez pas la permission de renommer ce fichier. Veuillez demander à son auteur de le renommer.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>Le nom du fichier contiens des caractères illégaux: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Impossible de renommer le fichier. Veuillez vous certifier que vous êtes bien connecté au serveur.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Impossible de renommer le fichier parce qu'un fichier avec le même nom existe déjà sur le serveur. Merci de choisir un autre nom.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3485,27 +3530,17 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>Le fichier contient des espaces de fin et n'a pas pu être renommé, car un fichier du même nom existe déjà sur le serveur.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>Le fichier contient des espaces de fin et n'a pas pu être renommé, car un fichier du même nom existe déjà localement.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Les liens symboliques ne sont pas pris en charge par la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Le fichier est présent dans la liste des fichiers ignorés.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Les noms de fichier se terminant par un point ne sont pas pris en charge sur votre système.</translation> </message> @@ -3515,62 +3550,72 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Les noms de fichier contenant le caractère '%1' ne sont pas pris en charge sur votre système.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>Les noms de fichiers contenant le caractère "%1" ne sont pas pris en charge par ce système de fichiers.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Le nom du fichier contient au moins un caractère interdit</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Le nom du fichier est un nom réservé dans le système de fichier</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>Le nom du fichier finit par des espaces.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Le nom du fichier est trop long.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Le fichier ou dossier a été ignoré car il est masqué.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Stat échoué.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Conflit : La version du serveur a été téléchargée, la version locale renommée et non téléversée.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>Le nom de fichier ne peut pas être encodé sur votre système de fichiers.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>Le nom du fichier est sur la liste noire du serveur.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>Le fichier a une extension réservée pour les fichiers virtuels.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>taille</translation> </message> @@ -3580,27 +3625,37 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>autorisations</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>le serveur a retourné "no %1"</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>permission</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>ID du fichier</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>Le fichier contient des espaces de fin et n'a pas pu être renommé, car un fichier du même nom existe déjà sur le serveur.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>Le fichier contient des espaces de fin et n'a pas pu être renommé, car un fichier du même nom existe déjà localement.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>le serveur a retourné "no %1"</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>Le serveur n'a signalé aucun %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation>Impossible de synchroniser à cause d'une date de modification invalide</translation> </message> @@ -3610,47 +3665,47 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Conflit lors de l'envoi de certains fichiers dans un dossier. Ceux conflictuels seront effacés!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Conflit lors de l'envoi d'un dossier. Il va être supprimé !</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Conflit lors de l'envoi d'un fichier. Il va être supprimé !</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignoré en raison de la liste noire "Sélectionner le contenu à synchroniser".</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Non autorisé car vous n'avez pas la permission d'ajouter des sous-dossiers dans ce dossier</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Non autorisé car vous n'avez pas la permission d'ajouter des fichiers dans ce dossier</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Non autorisé à envoyer ce fichier car il est en lecture seule sur le serveur. Restauration</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Déplacé vers une cible invalide, restauration</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Non autorisé à supprimer. Restauration</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Erreur de lecture de la base de données</translation> </message> @@ -3660,7 +3715,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Le serveur a répondu avec une erreur au moment de lire le dossier '%1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Le serveur a répondu avec une erreur lors de la lecture du dossier "%1" : %2</translation> </message> @@ -4114,7 +4169,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Sélectionner le contenu à synchroniser</translation> </message> @@ -4142,13 +4197,13 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Taille</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Aucun sous-dossier sur le serveur.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Une erreur est survenue lors du chargement de la liste des sous-dossiers.</translation> </message> @@ -4156,12 +4211,12 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation>Répondre</translation> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Ignorer</translation> </message> @@ -4208,11 +4263,6 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Chemin ownCloud :</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Icône</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>Partager le libellé</translation> @@ -4223,6 +4273,11 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Chemin Nextcloud :</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Icône</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4402,28 +4457,28 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Supprimer le lien de partage</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirmer la suppression du partage par lien</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Voulez-vous vraiment supprimer le partage par lien public<i>%1</i>? <p>Note: Cette action ne peut être annulée.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Supprimer</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Anuler</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Lien public</translation> </message> @@ -5152,12 +5207,12 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>L'encodage du nom de fichier n'est pas valide</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Impossible de lire le journal de synchronisation.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Impossible d'ouvrir le journal de synchronisation</translation> </message> @@ -5172,17 +5227,17 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Le nom de fichier contient au moins un caractère non valable</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>La synchronisation reprendra sous peu.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>L'espace disque est faible : les téléchargements qui amèneraient à réduire l'espace libre en dessous de %1 ont été ignorés.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Il n'y a pas suffisamment d’espace disponible sur le serveur pour certains envois.</translation> </message> @@ -5445,66 +5500,66 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Impossible d'effacer le message de statut de l'utilisateur. Assurez-vous que vous êtes connecté au serveur.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Ne pas effacer</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 minutes</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 heure</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 heures</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Aujourd'hui</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Cette semaine</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Il y a moins d'une minute</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 minute</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 minutes</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 heures</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 jour</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 jours</translation> </message> @@ -6170,7 +6225,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>En ligne</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>Marquer comme lu</translation> </message> @@ -6186,12 +6241,12 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation>Répondre à...</translation> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation>Envoyer la réponse dans la discussion</translation> </message> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index e08b85df3..451226072 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -752,47 +752,47 @@ Esta acción interromperá calquera sincronización que estea a executarse actua <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servizo non dispoñíbel</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Modo de mantemento</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Produciuse un erro na rede</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Produciuse un erro de configuración</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Solicitando credenciais</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Estado da conta descoñecido</translation> </message> @@ -800,17 +800,17 @@ Esta acción interromperá calquera sincronización que estea a executarse actua <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Para máis actividades, abra a aplicación Actividade.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Non se sincronizaran os ficheiros da lista de ignorados e as ligazóns simbólicas.</translation> </message> @@ -1589,7 +1589,7 @@ Confirma que quere sincronizar estas accións co servidor? Se fose un accidente e decide manter os seus ficheiros, volverán ser sincronizados dende o servidor.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1597,24 +1597,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Retirar todos os ficheiros?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Retirar todos os ficheiros</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Conservar os ficheiros</translation> </message> @@ -2497,7 +2497,7 @@ Os elementos onde se permite a eliminación eliminaranse se impiden que se elimi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2508,29 +2508,74 @@ Os elementos onde se permite a eliminación eliminaranse se impiden que se elimi </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3481,27 +3526,17 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>As ligazóns simbolicas non son admitidas nas sincronizacións.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>O ficheiro está na lista de ignorados.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Os nomes de ficheiros que rematan cun punto non son compatíbeis con este sistema de ficheiros.</translation> </message> @@ -3511,62 +3546,72 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Os nomes de ficheiros que conteñen o carácter «%1» non son compatíbeis con este sistema de ficheiros.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>O nome de ficheiro contén algún carácter incorrecto</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>O nome do ficheiro é un nome reservado neste sistema de ficheiros.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>O nome do ficheiro contén espazos finais.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>O nome de ficheiro é longo de máis.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>O ficheiro/cartafol ignórase por estar agochado.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Produciuse un fallo na obtención de estatísticas.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Conflito: Versión do servidor descargada, a copia local cambiou o nome e non se cargou.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>O nome do ficheiro non pode ser codificado no seu sistema de ficheiros.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>O nome do ficheiro está na lista de bloqueo no servidor.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>O ficheiro ten a extensión reservada para ficheiros virtuais.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>tamaño</translation> </message> @@ -3576,27 +3621,37 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>permisos</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>o servidor non informou de %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>ID do ficheiro</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>o servidor non informou de %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3606,47 +3661,47 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorado por mor da lista de bloqueo de «escolla que sincronizar»</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Non se lle permite porque vostede non ten permiso para engadir subcartafoles neste cartafol</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Non se lle permite porque vostede non ten permiso para engadir ficheiros neste cartafol</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Moveuse a un destino non válido, restaurándo</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Non está permitido retiralo, restaurando</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Produciuse un erro ao ler a base de datos</translation> </message> @@ -3656,7 +3711,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>O servidor respondeu cun erro ao ler o directorio «%1» : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4110,7 +4165,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Escolla que sincronizar</translation> </message> @@ -4138,13 +4193,13 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Tamaño</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Actualmente non hai subcartafoles no servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Produciuse un erro ao cargar a lista de subcartafoles.</translation> </message> @@ -4152,12 +4207,12 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Rexeitar</translation> </message> @@ -4204,11 +4259,6 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Ruta ao ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Icona</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>compartir etiqueta</translation> @@ -4219,6 +4269,11 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Ruta do Nexcloud:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Icona</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4398,27 +4453,27 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Eliminar a ligazón compartida</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar a eliminación da ligazón compartida</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Confirma que quere eliminar a ligazón pública compartida <i>%1</i>?</p><p>Nota: Esta acción non se pode desfacer.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Ligazón pública</translation> </message> @@ -5147,12 +5202,12 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>O nome de ficheiro codificado non é correcto</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Non foi posíbel ler dende o diario de sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Non foi posíbel abrir o diario de sincronización</translation> </message> @@ -5167,17 +5222,17 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>O nome de ficheiro contén algún carácter incorrecto</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Pouco espazo dispoñíbel no disco: As descargas que reduzan o tamaño por baixo de %1 van ser omitidas.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Non hai espazo libre abondo no servisor para algúns envíos.</translation> </message> @@ -5440,66 +5495,66 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6165,7 +6220,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6181,12 +6236,12 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_he.ts b/translations/client_he.ts index 4279288b3..80df9ac58 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -748,47 +748,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>לא מחובר לחשבון</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>מנותק </translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>מחובר</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>השירות אינו זמין</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>מצב תחזוקה</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>שגיאת רשת</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>שגיאת הגדרות</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>מבקש אישור</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>מצב חשבון לא ידוע</translation> </message> @@ -796,17 +796,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>לפעילויות נוספות נא לפתוח את יישומון הפעילויות.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1568,7 +1568,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1576,24 +1576,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>להסיר את כל הקבצים?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>להסיר את כל הקבצים</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>לשמור על הקבצים</translation> </message> @@ -2472,7 +2472,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2483,29 +2483,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3445,27 +3490,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3475,62 +3510,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>שם הקובץ מכיל רווחים עוקבים.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>שם הקובץ ארוך מדי.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3540,27 +3585,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3570,47 +3625,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3620,7 +3675,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4074,7 +4129,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>נא לבחור מה לסנכרן</translation> </message> @@ -4102,13 +4157,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>גודל</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>אין כרגע תת־תיקיות בשרת.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>אירעה שגיאה בעת טעינת רשימת תת־התיקיות.</translation> </message> @@ -4116,12 +4171,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>התעלמות</translation> </message> @@ -4168,11 +4223,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>נתיב ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>סמל</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>תווית שיתוף</translation> @@ -4183,6 +4233,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>נתיב Nextcloud:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>סמל</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4362,27 +4417,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>מחיקת קישור שיתוף</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>אישור מחיקת קישור לשיתוף</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>מחיקה</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>ביטול</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>קישור ציבורי</translation> </message> @@ -5111,12 +5166,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>קידוד שם הקובץ שגוי</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation type="unfinished"/> </message> @@ -5131,17 +5186,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>שם הקובץ מכיל אות שגויה אחת לפחות</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>אין די מקום פנוי בכונן: הורדות שעלולות להוריד את הנפח הפנוי מתחת לסף של %1 ידולגו.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>אין מספיק מקום זה בשרת לחלק מההורדות.</translation> </message> @@ -5404,66 +5459,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6129,7 +6184,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6145,12 +6200,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_hr.ts b/translations/client_hr.ts index 8e4ade0b6..d2586d642 100644 --- a/translations/client_hr.ts +++ b/translations/client_hr.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -752,47 +752,47 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju.</translation> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Odjavljen</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Odspojen</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Povezan</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Usluga nedostupna</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Način održavanja</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Pogreška mreže</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Pogreška konfiguracije</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Traženje vjerodajnica</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Nepoznato stanje računa</translation> </message> @@ -800,17 +800,17 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju.</translation> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Više aktivnosti možete pronaći u aplikaciji Activity.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Ne sinkroniziraju se datoteke s popisa za zanemarivanje kao ni simboličke poveznice.</translation> </message> @@ -1589,7 +1589,7 @@ Jeste li sigurni da želite sinkronizirati te radnje s poslužiteljem? Ako ste slučajno odabrali ovu radnju i želite zadržati svoje datoteke, ponovno će se sinkronizirati s poslužitelja.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1600,7 +1600,7 @@ Ako odlučite vratiti datoteke, ponovno će se sinkronizirati s poslužiteljem a Ako odlučite izbrisati datoteke, one će vam biti nedostupne ako niste njihov vlasnik.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1609,17 +1609,17 @@ Jeste li sigurni da želite sinkronizirati te radnje s poslužiteljem? Ako ste slučajno odabrali ovu radnju i želite zadržati svoje datoteke, ponovno će se sinkronizirati s poslužitelja.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Ukloniti sve datoteke?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Ukloni sve datoteke</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Zadrži datoteke</translation> </message> @@ -2502,7 +2502,7 @@ Stavke za koje je dopušteno brisanje bit će izbrisane ako sprječavaju uklanja <translation>Novi naziv datoteke</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Preimenuj datoteku</translation> </message> @@ -2513,29 +2513,74 @@ Stavke za koje je dopušteno brisanje bit će izbrisane ako sprječavaju uklanja </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>Sljedeći znakovi nisu dopušteni na ovom sustavu: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>Nemate dopuštenje za preimenovanje ove datoteke. Zatražite autora datoteke da je preimenuje.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>Naziv datoteke sadrži nedopuštene znakove: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Nije moguće preimenovati datoteku. Provjerite jeste li povezani s poslužiteljem.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Nije moguće preimenovati datoteku jer datoteka s istim nazivom već postoji na poslužitelju. Odaberite neki drugi naziv.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3486,27 +3531,17 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>Datoteka sadrži završne praznine i nije je moguće preimenovati jer datoteka s istim nazivom već postoji na poslužitelju.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>Datoteka sadrži završne praznine i nije je moguće preimenovati jer datoteka s istim nazivom već postoji na lokalnoj pohrani.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Simboličke poveznice nisu podržane u sinkronizaciji.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Datoteka je navedena na popisu za zanemarivanje.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Nazivi datoteka koji završavaju točkom nisu podržani u ovom datotečnom sustavu.</translation> </message> @@ -3516,62 +3551,72 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Nazivi datoteka koji sadrže znak „%1”nisu podržani u ovom datotečnom sustavu.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>Nazivi datoteka koji sadrže znak „%1” nisu podržani u ovom datotečnom sustavu.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Naziv datoteke sadrži barem jedan nevažeći znak</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Naziv datoteke je rezervirani naziv u ovom datotečnom sustavu.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>Naziv datoteke sadrži završne praznine.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Naziv datoteke je predugačak.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Datoteka/mapa se zanemaruje jer je skrivena.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Stat nije uspio.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Nepodudaranje: preuzeta inačica poslužitelja, lokalna kopija preimenovana i nije otpremljena.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>Naziv datoteke ne može se kodirati u vašem datotečnom sustavu.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>Ovaj naziv datoteke je blokiran na poslužitelju.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>Datoteka ima nastavak koji je rezerviran za virtualne datoteke.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>veličina</translation> </message> @@ -3581,27 +3626,37 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>dopuštenja</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>poslužitelj javlja da nema %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>dopuštenje</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>id datoteke</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>Datoteka sadrži završne praznine i nije je moguće preimenovati jer datoteka s istim nazivom već postoji na poslužitelju.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>Datoteka sadrži završne praznine i nije je moguće preimenovati jer datoteka s istim nazivom već postoji na lokalnoj pohrani.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>poslužitelj javlja da nema %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>Poslužitelj javlja da nema %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3611,47 +3666,47 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Došlo je do nepodudaranja pri otpremanju nekih datoteka u mapu. Nepodudarne datoteke će biti izbrisane!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Došlo je do nepodudaranja pri otpremanju mape. Nepodudarne mape će biti izbrisane!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Došlo je do nepodudaranja pri otpremanju datoteke. Nepodudarna datoteka će biti uklonjena!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Zanemareno zbog crne liste „odaberi što će se sinkronizirati”</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Nije dopušteno jer nemate dopuštenje za dodavanje podmapa u tu mapu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Nije dopušteno jer nemate dopuštenje za dodavanje datoteka u tu mapu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Nije dopušteno otpremiti ovu datoteku jer je dostupna samo za čitanje na poslužitelju, vraćanje</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Premješteno na nevažeće odredište, vraćanje</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Nije dopušteno uklanjanje, vraćanje</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Pogreška pri čitanju baze podataka</translation> </message> @@ -3661,7 +3716,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Poslužitelj je javio pogrešku pri čitanju direktorija '%1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Poslužitelj je javio pogrešku pri čitanju direktorija „%1” : %2</translation> </message> @@ -4115,7 +4170,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Odaberite što sinkronizirati</translation> </message> @@ -4143,13 +4198,13 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Veličina</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Trenutno na poslužitelju nema podmapa.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Došlo je do pogreške prilikom učitavanja popisa podmapa.</translation> </message> @@ -4157,12 +4212,12 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Zanemari</translation> </message> @@ -4209,11 +4264,6 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Put ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Ikona</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>oznaka za dijeljenje</translation> @@ -4224,6 +4274,11 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Nextcloudov put:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Ikona</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4403,27 +4458,27 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Izbriši poveznicu dijeljenja</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Potvrdi brisanje dijeljenja poveznicom</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Želite li zaista izbrisati dijeljenje javnom poveznicom <i>%1</i>?</p><p>Napomena: ovu radnju ne možete poništiti.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Izbriši</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Odustani</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Javna poveznica</translation> </message> @@ -5152,12 +5207,12 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Nevažeće kodiranje naziva datoteke</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Nije moguće čitati iz sinkronizacijskog dnevnika.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Nije moguće otvoriti sinkronizacijski dnevnik</translation> </message> @@ -5172,17 +5227,17 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Naziv datoteke sadrži barem jedan nevažeći znak</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>Sinkronizacija će se uskoro nastaviti.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Premalo prostora na disku: preskočena su preuzimanja koja bi smanjila slobodni prostor ispod %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Na nekim poslužiteljima nema dovoljno slobodnog prostora za određene otpreme.</translation> </message> @@ -5445,66 +5500,66 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Nije moguće izbrisati poruku o statusu korisnika. Provjerite jeste li povezani s poslužiteljem.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Ne briši</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 minuta</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 sat</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 sata</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Danas</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Ovaj tjedan</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Prije manje od minute</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 minuta</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 minuta</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 sati</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 dan</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 dana</translation> </message> @@ -6170,7 +6225,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Na mreži</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6186,12 +6241,12 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_hu.ts b/translations/client_hu.ts index 5087284a2..670088ade 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>További műveletek megjelenítése</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>Mellőzés</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>Megosztási párbeszédpanel megnyitása</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation>A(z) %1 fájlt %2 már zárolta.</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation>A(z) %1 zárolási művelete sikertelen a következő hibával: %2</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation>A(z) %1 feloldási művelete sikertelen a következő hibával: %2</translation> </message> @@ -752,47 +752,47 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást.</translation> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Kijelentkezve</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Kapcsolat bontva</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Kapcsolódva</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>A szolgáltatás nem érhető el</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Karbantartási üzemmód</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Hálózati hiba</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Beállítási hiba</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Hitelesítési adatok kérése</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Ismeretlen fiókállapot</translation> </message> @@ -800,17 +800,17 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást.</translation> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>További tevékenységekhez nyissa meg a Tevékenységek alkalmazást.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation>Tevékenységek lekérése…</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>A mellőzési listából származó fájlok, valamint a szimbolikus linkek nincsenek szinkronizálva.</translation> </message> @@ -1589,7 +1589,7 @@ Biztos, hogy szinkronizálni akarja ezeket a változásokat a kiszolgálóval? Ha ez véletlen volt, és úgy dönt, hogy megtartja ezeket a fájlokat, akkor újra szinkronizálva lesznek a kiszolgálóról.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1600,7 +1600,7 @@ Ha úgy dönt, hogy visszaállítja a fájlokat, akkor újra fel lesznek töltve Ha úgy dönt, hogy törli ezeket a fájlokat, akkor többé nem fogja azokat elérni, hacsak nem Ön a tulajdonos.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1609,17 +1609,17 @@ Biztos, hogy szinkronizálni akarja ezeket a változásokat a kiszolgálóval? Ha ez véletlen volt, és úgy dönt, hogy megtartja ezeket a fájlokat, akkor újra letöltésre kerülnek a kiszolgálóról.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Eltávolítja az összes fájlt?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Összes fájl eltávolítása</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Fájlok megtartása</translation> </message> @@ -2502,7 +2502,7 @@ Ahol a törlés engedélyezett, ott az elemek törölve lesznek, ha megakadályo <translation>Új fájlnév</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Fájl átnevezése</translation> </message> @@ -2513,29 +2513,74 @@ Ahol a törlés engedélyezett, ott az elemek törölve lesznek, ha megakadályo </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>A következő karakterek nem engedélyezettek a rendszeren: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>Nincs engedélye átnevezni ezt a fájlt. Kérje meg a fájl szerzőjét, hogy nevezze át.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>A fájlnév érvénytelen karaktereket tartalmaz: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>A fájl nem nevezhető át. Győződjön meg róla, hogy kapcsolódik-e a kiszolgálóhoz</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>A fájl nem nevezhető át, mert létezik egy ugyanilyen nevű fájl a kiszolgálón. Válasszon másik nevet.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3486,27 +3531,17 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>A fájl záró szóközöket tartalmaz, és nem lehetett átnevezni, mert egy azonos nevű fájl már létezik a kiszolgálón. </translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>A fájl záró szóközöket tartalmaz, és nem lehetett átnevezni, mert egy azonos nevű helyi fájl már létezik.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>A szimbolikus linkek nem támogatottak a szinkronizálás során.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>A fájl a mellőzési listán szerepel.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>A pontokkal végződő fájlneveket ez a fájlrendszer nem támogatja.</translation> </message> @@ -3516,62 +3551,72 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>A(z) „%1” karaktert tartalmazó fájlnevek nem támogatottak ezen a fájlrendszeren.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>A(z) „%1” karaktert tartalmazó fájlnevek nem támogatottak ezen a fájlrendszeren.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>A fájlnév legalább egy érvénytelen karaktert tartalmaz</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>A fájlnév egy fenntartott név ezen a fájlrendszeren.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>A fájlnév záró szóközt tartalmaz.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>A fájlnév túl hosszú.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>A fájl/mappa figyelmen kívül hagyva, mert rejtett.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Az elem kizárás vagy hiba miatt kihagyva.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Ütközés: A kiszolgáló verziója letöltve, a helyi példány átnevezve és nem lett feltöltve.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>A fájlnév nem kódolható a fájlrendszeren.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>A fájlnév feketelistára került a kiszolgálón.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>A fájlnak virtuális fájlok számára fenntartott kiterjesztése van.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>méret</translation> </message> @@ -3581,27 +3626,37 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>jogosultságok</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>kiszolgáló jelentése: hiányzó %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>jogosultság</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>fájlazonosító</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>A fájl záró szóközöket tartalmaz, és nem lehetett átnevezni, mert egy azonos nevű fájl már létezik a kiszolgálón. </translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>A fájl záró szóközöket tartalmaz, és nem lehetett átnevezni, mert egy azonos nevű helyi fájl már létezik.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>kiszolgáló jelentése: hiányzó %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>Kiszolgáló jelentése: hiányzó %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation>Az érvénytelen módosítási idő miatt nem lehet szinkronizálni</translation> </message> @@ -3611,47 +3666,47 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>Ütközés a fájlok mappába feltöltésekor. Az ütköző fájlok törölve lesznek!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Ütközés a mappa feltöltésekor. Törölve lesz!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Ütközés a fájl feltöltésekor. Törölve lesz!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>A „válassza ki a szinkronizálni kívánt elemeket” feketelista miatt figyelmen kívül hagyva</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Nem engedélyezett, mert nincs engedélye almappák hozzáadásához az adott a mappához</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Nem engedélyezett, mert nincs engedélye fájlok hozzáadására az adott mappában</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Ezt a fájlt nem lehet feltölteni, mert csak olvasható a kiszolgálón, helyreállítás</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Érvénytelen célba mozgatás, helyreállítás</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Az eltávolítás nem engedélyezett, helyreállítás</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Hiba történt az adatbázis olvasása során</translation> </message> @@ -3661,7 +3716,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>A kiszolgáló a következő hibával válaszolt a(z) „%1” könyvtár olvasása során: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>A kiszolgáló a következő hibával válaszolt a(z) „%1” könyvtár olvasása során: %2</translation> </message> @@ -4115,7 +4170,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Szinkronizálandó elemek kiválasztása</translation> </message> @@ -4143,13 +4198,13 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>Méret</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Jelenleg nincsenek almappák a kiszolgálón.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Hiba történt az almappák listájának betöltésekor.</translation> </message> @@ -4157,12 +4212,12 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation>Válasz</translation> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Elutasítás</translation> </message> @@ -4209,11 +4264,6 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>ownCloud útvonal:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Ikon</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>megosztási címke</translation> @@ -4224,6 +4274,11 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>Nextcloud útvonal:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Ikon</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4403,27 +4458,27 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>Megosztási hivatkozás törlése</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Megosztási hivatkozás törlésének megerősítése</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Tényleg törölni szeretné a(z) <i>%1</i> nyilvános megosztási hivatkozást?</p><p>Megjegyzés: Ez nem vonható vissza.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Törlés</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Mégse</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Nyilvános hivatkozás</translation> </message> @@ -5152,12 +5207,12 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>A fájlnév kódolása érvénytelen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Nem lehet olvasni a szinkronizálási naplóból.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>A szinkronizálási napló nem nyitható meg</translation> </message> @@ -5172,17 +5227,17 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>A fájlnév legalább egy érvénytelen karaktert tartalmaz</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>A szinkronizálás rövidesen folytatódik.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Túl kevés a tárterület: A letöltések, melyek %1 alá csökkentették volna a szabad tárhelyet, kihagyásra kerültek.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Egyes feltöltésekhez nincs elég hely a kiszolgálón.</translation> </message> @@ -5445,66 +5500,66 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>A felhasználói állapot nem törölhető. Győződjön meg róla, hogy kapcsolódik a kiszolgálóhoz.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Ne törölje</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 perc</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 óra</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 óra</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Ma</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Ezen a héten</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Kevesebb mint egy perc</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 perc</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 perc</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 óra</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 nap</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 nap</translation> </message> @@ -6170,7 +6225,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>Elérhető</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>Megjelölés olvasottként</translation> </message> @@ -6186,12 +6241,12 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation>Válasz…</translation> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation>Válasz küldése a csevegőüzenetre</translation> </message> diff --git a/translations/client_id.ts b/translations/client_id.ts index b20ecb540..e975761d8 100644 --- a/translations/client_id.ts +++ b/translations/client_id.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Log keluar</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Terputus</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Tersambung</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Layanan tidak tersedia</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Mode perbaikan</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Kesalahan jaringan</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Kesalahan konfigurasi</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Menanyakan Kredensial</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Kondisi akun tidak diketahui</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1573,7 +1573,7 @@ Anda yakin ingin mesinkronisasi aksi tersebut dengan server? Jika ini adalah sebuah ketidaksengajaan dan Anda memutuskan untuk berkas Anda tetap tersedia, berkas-berkas Anda akan disinkronisasi ulang dengan server.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1581,24 +1581,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -2477,7 +2477,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2488,29 +2488,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3450,27 +3495,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3480,62 +3515,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3545,27 +3590,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3575,47 +3630,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3625,7 +3680,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4079,7 +4134,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation type="unfinished"/> </message> @@ -4107,13 +4162,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation type="unfinished"/> </message> @@ -4121,12 +4176,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation type="unfinished"/> </message> @@ -4173,11 +4228,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation type="unfinished"/> @@ -4188,6 +4238,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation type="unfinished"/> @@ -4367,27 +4422,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Hapus tautan berbagi</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation type="unfinished"/> </message> @@ -5114,12 +5169,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation type="unfinished"/> </message> @@ -5134,17 +5189,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> @@ -5407,66 +5462,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6132,7 +6187,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6148,12 +6203,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_is.ts b/translations/client_is.ts index 941a4a8ef..a59d3d6ea 100644 --- a/translations/client_is.ts +++ b/translations/client_is.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -753,47 +753,47 @@ gagnageymslur: </translation> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Skráð/ur út</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Aftengt</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Tengt</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Þjónusta ekki tiltæk</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Viðhaldshamur</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Villa í netkerfi</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Villa í stillingum</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Spyr um auðkenni</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Óþekkt staða notandaaðgangs</translation> </message> @@ -801,17 +801,17 @@ gagnageymslur: </translation> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1573,7 +1573,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1581,24 +1581,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Fjarlægja allar skrár?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Fjarlægja allar skrár</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Halda skrám</translation> </message> @@ -2476,7 +2476,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2487,29 +2487,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3452,27 +3497,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3482,62 +3517,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3547,27 +3592,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3577,47 +3632,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3627,7 +3682,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4081,7 +4136,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Veldu það sem á að samstilla</translation> </message> @@ -4109,13 +4164,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stærð</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Engar undirmöppur á þjóninum.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Villa átti sér stað við að hlaða inn lista yfir undirmöppur.</translation> </message> @@ -4123,12 +4178,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Hafna</translation> </message> @@ -4175,11 +4230,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud slóð:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Táknmynd</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>merki á sameign</translation> @@ -4190,6 +4240,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nextcloud-slóð:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Táknmynd</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4369,28 +4424,28 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Eyða tengli á sameign</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Staðfestu eyðingu tengils á sameign</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Ertu viss um að þú viljir eyða opinbera tenglinum á sameignina <i>%1</i>?< /p><p>Athugaðu: Þessi aðgerð er óafturkræf.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Eyða</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Hætta við</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Opinber tengill</translation> </message> @@ -5119,12 +5174,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stafatafla skráarheitis er ekki gild</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Tekst ekki að lesa úr atvikaskrá samstillingar.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Tekst ekki að opna atvikaskrá samstillingar</translation> </message> @@ -5139,17 +5194,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Skráarheitið inniheldur að minnsta kosti einn ógildan staf</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> @@ -5413,66 +5468,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6138,7 +6193,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6154,12 +6209,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_it.ts b/translations/client_it.ts index 992cfb148..22e72dab5 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>Mostra altre azioni</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>Annulla</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>Apri finestra di condivisione</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -752,47 +752,47 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Disconnesso</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Disconnesso</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Connesso</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servizio non disponibile</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Modalità Manutenzione</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Errore di rete</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Errore di configurazione</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Richiesta credenziali</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Stato dell'account sconosciuto</translation> </message> @@ -800,17 +800,17 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Per altre attività, apri l'applicazione Attività.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>I file dell'elenco da ignorare e i collegamenti simbolici non sono sincronizzati.</translation> </message> @@ -1590,7 +1590,7 @@ Sei sicuro di voler sincronizzare queste azioni con il server? Se è stato un errore e decidi di tenere i file, saranno sincronizzati nuovamente dal server.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1601,7 +1601,7 @@ Se decidi di ripristinare i file, essi saranno sincronizzati nuovamente con il s Se decidi di eliminare i file, non saranno più disponibili, a meno che tu sia il proprietario.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1610,17 +1610,17 @@ Sei sicuro di voler sincronizzare queste azioni con il server? Se è stato un errore e decidi di tenere i file, saranno sincronizzati nuovamente dal server.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Vuoi rimuovere tutti i file?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Rimuovi tutti i file</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Mantieni i file</translation> </message> @@ -2501,7 +2501,7 @@ Gli elementi per i quali è consentita l'eliminazione saranno eliminati se <translation>Nuovo nome del file</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Rinomina file</translation> </message> @@ -2512,29 +2512,74 @@ Gli elementi per i quali è consentita l'eliminazione saranno eliminati se </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>I seguenti caratteri non sono consentiti nel sistema: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>Non hai il permesso di rinominare questo file. Chiedi all'autore del file di rinominarlo.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>Il nome del file contiene caratteri non consentiti: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Impossibile rinominare il file. Assicurati di essere connesso al server.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Impossibile rinominare il file perché ne esiste già uno con lo stesso nome sul server. Scegli un altro nome.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3476,27 +3521,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>Il fie contiene spazi finali e non può essere rinominato, perchè esiste già un file con lo stesso nome sul server.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>Il fie contiene spazi finali e non può essere rinominato, perchè esiste già un file con lo stesso nome in locale.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>I collegamenti simbolici non sono supportati dalla sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Il file è presente nell'elenco degli ignorati.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>I nomi del file che terminano con un punto non sono supportati su questo file system.</translation> </message> @@ -3506,62 +3541,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>I nomi del file che contengono il carattere '%1' non sono supportati su questo file system.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>I nomi del file che contengono il carattere "%1" non sono supportati su questo file system.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Il nome del file contiene almeno un carattere non valido</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Il nome del file è un nome riservato su questo file system.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>Il nome del file contiene spazi alla fine.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Il nome del file è troppo lungo.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Il file/cartella è ignorato poiché è nascosto.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Stat non riuscita.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Conflitto: versione del server scaricata, copia locale rinominata e non caricata.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>Il nome del file non può essere codificato sul tuo file system.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>Il nome del file è nella lista nera sul server.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>Il file ha l'estensione riservata ai file virtuali.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>dimensione</translation> </message> @@ -3571,27 +3616,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>permessi</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>il server non ha restituito alcun %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>permesso</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>ID del file</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>Il fie contiene spazi finali e non può essere rinominato, perchè esiste già un file con lo stesso nome sul server.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>Il fie contiene spazi finali e non può essere rinominato, perchè esiste già un file con lo stesso nome in locale.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>il server non ha restituito alcun %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>Il server non ha restituito alcun %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation>Impossibile sincronizzare a causa di un orario di modifica non valido</translation> </message> @@ -3601,47 +3656,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Conflitto durante l'invio di alcuni file in una cartella. I file in conflitto verranno eliminati!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Conflitto durante l'invio di una cartella. Verrà svuotata!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Conflitto durante l'invio di un file. Verrà rimosso!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Non consentito perché non sei autorizzato ad aggiungere sottocartelle a quella cartella</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Non ti è consentito perché non hai i permessi per aggiungere file in quella cartella </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Non ti è permesso caricare questo file perché hai l'accesso in sola lettura sul server, ripristino</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Spostato su una destinazione non valida, ripristino</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Rimozione non consentita, ripristino</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Errore durante la lettura del database</translation> </message> @@ -3651,7 +3706,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Il server ha risposto con un errore durante la lettura della cartella '% 1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Il server ha risposto con un errore durante la lettura della cartella "%1" : %2</translation> </message> @@ -4105,7 +4160,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Scegli cosa sincronizzare</translation> </message> @@ -4133,13 +4188,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Dimensione</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Attualmente non ci sono sottocartelle sul server.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Si è verificato un errore durante il caricamento dell'elenco delle sottocartelle.</translation> </message> @@ -4147,12 +4202,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation>Rispondi</translation> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Annulla</translation> </message> @@ -4199,11 +4254,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Percorso di ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Icona</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>etichetta di condivisione</translation> @@ -4214,6 +4264,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Percorso Nextcloud:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Icona</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4393,27 +4448,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Elimina collegamento di condivisione</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Conferma eliminazione collegamento di condivisione</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Vuoi davvero eliminare la condivisione del collegamento pubblico <i>%1</i>?</p><p>Nota: questa azione non può essere annullata.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Elimina</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Annulla</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Collegamento pubblico</translation> </message> @@ -5142,12 +5197,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>La codifica del nome del file non è valida</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Impossibile leggere dal registro di sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Impossibile aprire il registro di sincronizzazione</translation> </message> @@ -5162,17 +5217,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Il nome del file contiene almeno un carattere non valido</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>La sincronizzazione riprenderà a breve.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Lo spazio su disco è basso: gli scaricamenti che potrebbero ridurre lo spazio libero sotto %1 saranno saltati.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Spazio disponibile insufficiente sul server per alcuni caricamenti.</translation> </message> @@ -5435,66 +5490,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Impossibile cancellare il messaggio di stato dell'utente. Assicurati di essere connesso al server.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Non cancellare</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 minuti</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 ora</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 ore</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Oggi</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Questa settimana</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Meno di un minuto</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 minuto</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 minuti</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 ore</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 giorno</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 giorni</translation> </message> @@ -6160,7 +6215,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>In linea</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>Marca come letto</translation> </message> @@ -6176,12 +6231,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation>Rispondi a …</translation> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation>Invia risposta al messaggio di chat</translation> </message> diff --git a/translations/client_ja.ts b/translations/client_ja.ts index 63a8f70f6..f6d3e01fb 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>その他の操作を表示</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>閉じる</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>共有ダイアログを開く</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation>ファイル %1 はすでに %2 がロックしています</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -752,47 +752,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>サインアウト</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>切断しました</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>接続しました</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>サービスが利用できません</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>メンテナンスモード</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>ネットワークエラー</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>設定エラー</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>証明書を要求</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>不明なアカウント状態</translation> </message> @@ -800,17 +800,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>その他のアクティビティについては、アクティビティアプリを開いてください。</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation>アクティビティを取得中...</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>除外ファイルリスト内のファイルやシンボリックリンクは同期されません。</translation> </message> @@ -1587,7 +1587,7 @@ If this was an accident and you decide to keep your files, they will be re-synce これが操作ミスであり、ファイルを維持することにした場合、ファイルはサーバーから再同期されます。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1598,7 +1598,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a ファイルを削除することにした場合、所有者でない限り、ファイルは利用できなくなります。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1607,17 +1607,17 @@ If this was an accident and you decide to keep your files, they will be re-synce これが操作ミスであり、ファイルを維持することにした場合、ファイルはサーバーから再同期されます。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>すべてのファイルを削除しますか？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>すべてのファイルを削除</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>ファイルを保持</translation> </message> @@ -2499,7 +2499,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>新しいファイル名</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>ファイル名を変更</translation> </message> @@ -2510,29 +2510,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>次の文字はシステムで許可されていません: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>このファイルの名前を変更する権限がありません。ファイルの作成者に名前の変更を依頼してください。</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>ファイル名に不正な文字が含まれています: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>ファイルの名前を変更できませんでした。サーバーに接続していることを確認してください。</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>同じ名前のファイルがサーバーにすでに存在するため、ファイルの名前を変更できません。別の名前を選んでください。</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3482,27 +3527,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>ファイルに末尾のスペースが含まれていますが、同じ名前のファイルがサーバーに既に存在するため、名前を変更できませんでした。</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>ファイルに末尾のスペースが含まれていますが、同じ名前のファイルが既にローカルに存在するため、名前を変更できませんでした。</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>シンボリックリンクは同期ではサポートされていません。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>ファイルは除外リストに登録されています。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>ピリオドで終わるファイル名はこのファイルシステムでサポートされていません。</translation> </message> @@ -3512,62 +3547,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ファイル名に含まれる文字 '%1' はこのファイルシステムでサポートされていません。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>ファイル名に含まれる文字 "%1" はこのファイルシステムでサポートされていません。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>ファイル名は少なくとも１つ以上の無効な文字を含んでいます</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>ファイル名はファイルシステムに予約されています。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>ファイル名末尾にスペースが含まれます。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>ファイル名は長すぎます。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>隠しファイル/フォルダーのため無視されました</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>情報取得エラー</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>コンフリクト: サーバーのバージョンがダウンロードされて、ローカルのコピーはファイル名を変更しアップロードしません。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>あなたのファイルシステムでファイル名をエンコードできません。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>このファイル名はサーバーにブロックされました。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>ファイルの拡張子は仮想ファイル用に予約されています。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>サイズ</translation> </message> @@ -3577,27 +3622,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>権限</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>サーバーから no %1 と通知がありました</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>権限</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>ファイルID</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>ファイルに末尾のスペースが含まれていますが、同じ名前のファイルがサーバーに既に存在するため、名前を変更できませんでした。</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>ファイルに末尾のスペースが含まれていますが、同じ名前のファイルが既にローカルに存在するため、名前を変更できませんでした。</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>サーバーから no %1 と通知がありました</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation>修正日時が無効なため同期できません</translation> </message> @@ -3607,47 +3662,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>一部のファイルをフォルダにアップロードするときに競合が発生しました。これらの競合はクリアされます！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>フォルダをアップロードするときに競合したので、クリアされます！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>フォルダをアップロードするときに競合したので、削除されます！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>"選択されたものを同期する" のブラックリストにあるために無視されました</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>そのフォルダーにサブフォルダーを追加する権限がありません</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>そのフォルダーにファイルを追加する権限がありません</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>サーバー上で読み取り専用のため、ファイルをアップロードできません。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>無効なターゲットに移動し、復元しました</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>削除、復元は許可されていません</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>データベースを読み込み中にエラーが発生しました</translation> </message> @@ -3657,7 +3712,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>サーバーがディレクトリ '%1' の読み取り中にエラーで応答しました: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>サーバーでディレクトリ "%1" を読み取り中にエラーになりました: %2</translation> </message> @@ -4111,7 +4166,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>同期フォルダーを選択</translation> </message> @@ -4139,13 +4194,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>サイズ</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>現在サーバーにサブフォルダーはありません。</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>サーバーからフォルダーのリスト取得時にエラーが発生しました。</translation> </message> @@ -4153,12 +4208,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation>返信</translation> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>閉じる</translation> </message> @@ -4205,11 +4260,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>OwnCloudのパス:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>アイコン</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>共有ラベル</translation> @@ -4220,6 +4270,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nextcloudのパス：</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>アイコン</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4399,27 +4454,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>共有リンクを削除</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>リンク共有の削除を確認する</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>本当にこの公開リンク共有<i>%1</i>を削除しますか？</p><p>注：この操作を元に戻すことはできません。</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>削除</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>キャンセル</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>公開リンク</translation> </message> @@ -5148,12 +5203,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ファイル名のエンコーディングが無効です。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>同期ジャーナルから読み込みできません</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>同期ジャーナルを開くことができません</translation> </message> @@ -5168,17 +5223,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ファイル名に1文字以上の無効な文字が含まれています</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>まもなく同期が再開されます。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>ディスク容量が少ない：%1以下の空き容量を減らすダウンロードはスキップされました。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>いくつかのアップロードのために、サーバーに十分なスペースがありません。</translation> </message> @@ -5441,66 +5496,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ユーザーステータスメッセージをクリアできませんでした。サーバーに接続していることを確認してください。</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>消去しない</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30分</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 時間</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4時間</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>今日</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>今週</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>1分以内</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 分</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 秒</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 時間</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1日</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 日</translation> </message> @@ -6166,7 +6221,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>オンライン</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>既読にする</translation> </message> @@ -6182,12 +6237,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation>返信...</translation> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation>チャットメッセージに返信</translation> </message> diff --git a/translations/client_ko.ts b/translations/client_ko.ts index 96ce0de9d..b8f106517 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -752,47 +752,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>로그아웃</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>연결 해제됨</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>연결됨</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>서비스 사용할 수 없음</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>유지 보수 모드</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>네트워크 오류</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>설정 오류</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>자격 증명 요청</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>알 수 없는 사용자 상태</translation> </message> @@ -800,17 +800,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>무시 목록의 파일과 심볼릭 링크는 동기화되지 않습니다.</translation> </message> @@ -1589,7 +1589,7 @@ If this was an accident and you decide to keep your files, they will be re-synce 이 동작이 우연이고 파일을 유지하고자 할 경우, 서버로부터 재동기화 될 것입니다.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1600,7 +1600,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a 파일을 삭제하기로 결정한 경우 소유자가 아닌 한 해당 파일을 사용할 수 없습니다.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1609,17 +1609,17 @@ If this was an accident and you decide to keep your files, they will be re-synce 이 동작이 우연이고 파일을 유지하고자 할 경우, 서버로부터 재동기화 될 것입니다.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>모두 삭제합니까?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>모두 삭제</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>파일 유지</translation> </message> @@ -2503,7 +2503,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>새 파일 이름</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>파일 이름 바꾸기</translation> </message> @@ -2514,29 +2514,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>이 시스템에서 다음의 문자를 사용할 수 없음: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>이 파일의 이름을 바꿀 권한이 없습니다. 이 파일의 소유자에게 변경을 요청하십시오.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>파일 이름에 허용하지 않는 문자가 있음: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>파일 이름을 바꿀 수 없습니다. 서버에 연결되어 있는지 확인하십시오.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>서버에 동일한 이름의 파일이 있어 파일의 이름을 변경할 수 없습니다. 다른 이름을 선택하십시오.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3490,27 +3535,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>심볼릭 링크는 동기화에서 지원되지 않습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>파일이 무시 목록에 추가되었습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>마침표로 끝나는 파일 이름은 이 파일 시스템에서 지원되지 않습니다.</translation> </message> @@ -3520,62 +3555,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>'%1'을 포함하는 파일 이름은 이 파일 시스템에서 지원되지 않습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>파일 이름에 잘못된 글자가 한 자 이상 있음</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>해당 파일 이름은 이 파일 시스템에서 예약된 이름입니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>파일 이름 뒤에 공백이 있습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>파일 이름이 너무 깁니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>파일/폴더가 숨겨져 있으므로 무시됩니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>스탯 실패</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>충돌: 서버 버전이 다운로드되었으며 로컬 사본의 이름이 바뀌었고 업로드되지 않았습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>내 파일 시스템에서 파일 이름을 인코딩 할 수 없습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>파일 이름이 서버 블랙리스트에 있습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>파일이 가상 파일에 예약된 확장자를 가짐</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>크기</translation> </message> @@ -3585,27 +3630,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>권한</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>서버가 %1이(가) 없다고(아니라고) 보고함</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>파일 id</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>서버가 %1이(가) 없다고(아니라고) 보고함</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3615,47 +3670,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>"동기화 할 대상 선택" 블랙리스트로 인해 무시되었습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>해당 폴더에 하위 폴더를 추가 할 수 있는 권한이 없기 때문에 허용되지 않습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>해당 폴더에 파일을 추가 할 권한이 없으므로 허용되지 않습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>이 파일은 서버에서 읽기 전용이므로 업로드 할 수 없습니다. 복구</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>유효하지 않은 목적지로 옮겨짐, 복구</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>삭제가 허용되지 않음, 복구</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>데이터베이스를 읽는 중 오류 발생</translation> </message> @@ -3665,7 +3720,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>서버가 디렉토리 '%1'을(를) 읽는 중 오류에 대응함: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4119,7 +4174,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>동기화 대상 선택</translation> </message> @@ -4147,13 +4202,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>크기</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>서버에 하위 폴더 없음</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>하위 폴더 목록을 불러오는 중 오류 발생</translation> </message> @@ -4161,12 +4216,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>무시</translation> </message> @@ -4213,11 +4268,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud 경로:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>아이콘</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>공유 라벨</translation> @@ -4228,6 +4278,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nextcloud 경로:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>아이콘</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4407,27 +4462,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>공유 링크 삭제</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>링크 공유 삭제 확인</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>공개 링크 공유 <i>%1</i>를 정말로 삭제 하시겠습니까?</p><p>메모: 이 작업은 되돌릴 수 없습니다.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>삭제</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>취소</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>공개 링크</translation> </message> @@ -5156,12 +5211,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>파일 이름 인코딩이 올바르지 않습니다.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>동기화 저널에서 읽을 수 없습니다.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>동기화 저널을 열 수 없습니다.</translation> </message> @@ -5176,17 +5231,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>파일 이름에 유효하지 않은 문자가 하나 이상 있습니다.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>디스크 공간이 부족합니다. 여유 공간이 %1 미만으로 남으면 다운로드를 건너 뜁니다.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>일부 업로드를 위해 서버에 사용 가능한 공간이 부족합니다.</translation> </message> @@ -5449,66 +5504,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6174,7 +6229,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>접속 중</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6190,12 +6245,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts index 04fb12827..d820ce69c 100644 --- a/translations/client_lt_LT.ts +++ b/translations/client_lt_LT.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Atsijungta</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Atjungta</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Prijungta</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Paslauga nepasiekiama</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Techninės priežiūros veiksena</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Tinklo klaida</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Konfigūracijos klaida</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Klausiama prisijungimo duomenų</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Nežinoma paskyros būsena</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Jei norite matyti daugiau veiklos, atidarykite programą Veikla.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1578,7 +1578,7 @@ Jei tai buvo netyčinis veiksmas ir jūs nusprendėte išsaugoti savo failus, ji Open in Google Translate</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1586,24 +1586,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Šalinti visus failus?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Šalinti visus failus</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Palikti failus</translation> </message> @@ -2486,7 +2486,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2497,29 +2497,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3461,27 +3506,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3491,62 +3526,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>Failo pavadinime yra galinių tarpų.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Failo pavadinimas yra per ilgas.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Failo/Aplanko nepaisoma, nes jis yra paslėptas.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>dydis</translation> </message> @@ -3556,27 +3601,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>leidimai</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>failo id</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3586,47 +3641,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Klaida skaitant duomenų bazę</translation> </message> @@ -3636,7 +3691,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4090,7 +4145,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Pasirinkite ką sinchronizuoti</translation> </message> @@ -4118,13 +4173,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Dydis</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Šiuo metu serveryje nėra jokių poaplankių.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Įkeliant poaplankių sąrašą, įvyko klaida.</translation> </message> @@ -4132,12 +4187,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Atmesti</translation> </message> @@ -4184,11 +4239,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud kelias:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Piktograma</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>viešinio etiketė</translation> @@ -4199,6 +4249,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nextcloud kelias:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Piktograma</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4378,27 +4433,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ištrinti bendrinimo nuorodą</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Patvirtinkite dalinimosi nuorodos trynimą</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Ar tikrai norite ištrinti viešąją bendrinimo nuorodą <i>%1</i>?</p><p>Pastaba: Šio veiksmo negalima bus atšaukti.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Ištrinti</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Atsisakyti</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Viešoji nuoroda</translation> </message> @@ -5127,12 +5182,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Failo kodavimas neteisingas</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Nepavyko perskaityti sinchronizavimo žurnalo.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Nepavyksta atverti sinchronizavimo žurnalo</translation> </message> @@ -5147,17 +5202,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Failo pavadinime yra bent vienas neleistinas simbolis</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Mažai vietos diske: atsisiuntimai, kurie sumažintų vietą iki %1 buvo praleisti.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Kai kuriems įkėlimams serveryje neužteks vietos.</translation> </message> @@ -5420,66 +5475,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6145,7 +6200,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6161,12 +6216,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_lv.ts b/translations/client_lv.ts index 824756549..59f134f9c 100644 --- a/translations/client_lv.ts +++ b/translations/client_lv.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Izrakstījies</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Atvienojies</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Savienojies</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Serviss nav pieejams</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Uzturēšanas režīms</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Tīkla kļūda</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Konfigurācijas kļūda</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Pieprasa atkreditāciju</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Nezināms konta stāvoklis</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1565,7 +1565,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1573,24 +1573,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Noņemt visas datnes?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Noņemt visas datnes</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Saglabāt datnes</translation> </message> @@ -2467,7 +2467,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2478,29 +2478,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3438,27 +3483,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3468,62 +3503,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3533,27 +3578,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3563,47 +3618,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3613,7 +3668,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4067,7 +4122,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation type="unfinished"/> </message> @@ -4095,13 +4150,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Izmērs</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation type="unfinished"/> </message> @@ -4109,12 +4164,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation type="unfinished"/> </message> @@ -4161,11 +4216,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>koplietošanas etiķete</translation> @@ -4176,6 +4226,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4355,27 +4410,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Apstiprināt koplietošanas saites dzēšanu</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Dzēst</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Atcelt</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation type="unfinished"/> </message> @@ -5102,12 +5157,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Nevar atvērt sinhronizācijas žurnālu</translation> </message> @@ -5122,17 +5177,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> @@ -5395,66 +5450,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6120,7 +6175,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6136,12 +6191,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_mk.ts b/translations/client_mk.ts index a696125e2..189c43ebd 100644 --- a/translations/client_mk.ts +++ b/translations/client_mk.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Одјавен</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Исклучен</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Поврзан</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Сервисот е недостапен</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Мод за одржување</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Грешка во мрежата</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Грешка во конфигурацијата</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Побарување на акредитиви</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Сметка со непознат статус</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>За повеќе активности отворете ја апликацијата со активности.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1567,7 +1567,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1575,24 +1575,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Дали сакате да ги избришете сите датотеки?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Отстрани ги сите датотеки</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Задржи ги датотеките</translation> </message> @@ -2474,7 +2474,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2485,29 +2485,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3447,27 +3492,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Датотека е на листата за игнорирани датотеки.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3477,62 +3512,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Името на датотеката соджи невалиден карактер</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Ова име на датотека е резервирано име на системот.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Името на датотеката е премногу долго.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Датотека/Папка е игнорирана бидејќи е сокриена.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Конфликт: Верзијата од серверот е преземена, локалната верзија е преименувана и не е прикачена на серверот.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>Името на датотеката е на црна листа на серверот.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>големина</translation> </message> @@ -3542,27 +3587,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>дозволи</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>id на датотека</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3572,47 +3627,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Не е дозволено бидејќи немате дозвола да додавате потпапки во оваа папка</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Не е дозволено бидејќи немате дозвола да додавате датотеки во оваа папка</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Не е дозволено да ја прикачите оваа датотека бидејќи е само за читање на серверот, враќање</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Не е дозволено бришење, враќање</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Грешка при вчитување на податоци од датабазата</translation> </message> @@ -3622,7 +3677,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Серверот одговори со грешка при читање на папката '%1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4076,7 +4131,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Изберете што да се синхронизира</translation> </message> @@ -4104,13 +4159,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Големина</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Моментално нема потпапки на серверот.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Настана грешка при вчитување на листата со потпапки</translation> </message> @@ -4118,12 +4173,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Отфрли</translation> </message> @@ -4170,11 +4225,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud патека:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Икона</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>ознака на споделувањето</translation> @@ -4185,6 +4235,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nextcloud патека:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Икона</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4364,27 +4419,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Избриши го линкот за споделување</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Потврди бришење на линк за споделување</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Дали сте сигурни дека сакате да го отстраните јавниот линк за споделување <i>%1</i>?</p><p>Забелешка: Оваа акција неможе да се врати.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Избриши</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Откажи</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Јавен линк</translation> </message> @@ -5113,12 +5168,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation type="unfinished"/> </message> @@ -5133,17 +5188,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Името на датотеката соджи невалиден карактер</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Има малку простор на дискот: Преземањата ќе доведат да просторот на дискот се намали под %1 поради тоа се прескокнува.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> @@ -5406,66 +5461,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6131,7 +6186,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6147,12 +6202,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index bb7afea82..86ed0c952 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -752,47 +752,47 @@ Denne handlingen vil avbryte enhver synkronisering som kjører.</translation> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Logget ut</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Frakoblet</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Tilkoblet</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Tjeneste utilgjengelig</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Vedlikeholdsmodus</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Nettverksfeil</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Konfigurasjonsfeil</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Spør etter legitimasjon</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Ukjent kontotilstand</translation> </message> @@ -800,17 +800,17 @@ Denne handlingen vil avbryte enhver synkronisering som kjører.</translation> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>For flere aktiviteter, åpne Aktivitetsappen.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Filer fra ignoreringslisten så vel som symbolske lenker synkroniseres ikke.</translation> </message> @@ -1575,7 +1575,7 @@ Er du sikker på at du ønsker å synkronisere denne handlingen med serveren? Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert tilbake fra serveren.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1583,24 +1583,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Fjerne alle filer?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Fjern alle filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Behold filer</translation> </message> @@ -2479,7 +2479,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2490,29 +2490,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3451,27 +3496,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3481,62 +3516,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3546,27 +3591,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3576,47 +3631,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3626,7 +3681,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4080,7 +4135,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Velg hva som synkroniseres</translation> </message> @@ -4108,13 +4163,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Størrelse</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Ingen undermapper på serveren nå</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Det oppstod en feil ved lasting av liten med undermapper.</translation> </message> @@ -4122,12 +4177,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Forkast</translation> </message> @@ -4174,11 +4229,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nextcloud-sti:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Ikon</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>Tittel for deling</translation> @@ -4189,6 +4239,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Ikon</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4368,27 +4423,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Slett lenke til deling</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Slett</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Offentlig lenke</translation> </message> @@ -5117,12 +5172,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Filnavn-koding er ikke gyldig</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Kan ikke lese fra synkroniseringsjournalen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Kan ikke åpne synkroniseringsjournalen</translation> </message> @@ -5137,17 +5192,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Filnavnet inneholder minst ett ulovlig tegn</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> @@ -5410,66 +5465,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6135,7 +6190,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6151,12 +6206,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index b524e8db5..6dd2b8cd9 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -751,47 +751,47 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.</translati <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Afgemeld</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Niet verbonden</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Verbonden</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Dienst niet beschikbaar</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Onderhoudsmodus</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Netwerkfout</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Configuratiefout</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Vragen naar inloggegevens</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Onbekende account-status</translation> </message> @@ -799,17 +799,17 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.</translati <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Voor meer activiteiten open de Activiteit app.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Bestanden op de negeerlijst en symbolische links worden niet gesynchroniseerd.</translation> </message> @@ -1587,7 +1587,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Als dit een ongelukje was en je de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de server.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1598,7 +1598,7 @@ Als je de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de ser Als je de bestanden wilt verwijderen, worden ze niet beschikbaar, tenzij je de eigenaar bent.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1606,17 +1606,17 @@ If this was an accident and you decide to keep your files, they will be re-synce Als dit een ongelukje was en je de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de server.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Alle bestanden verwijderen?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Alle bestanden verwijderen</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Bestanden bewaren</translation> </message> @@ -2504,7 +2504,7 @@ Onderdelen die gewist mogen worden, worden verwijderd als ze verhinderen dat een <translation>Nieuwe bestandsnaam</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Bestand hernoemen</translation> </message> @@ -2515,29 +2515,74 @@ Onderdelen die gewist mogen worden, worden verwijderd als ze verhinderen dat een </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>De volgende tekens zijn niet toegestaan op het systeem: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>Je bent niet gemachtigd om dit bestand te hernoemen. Vraag de auteur van het bestand om het te hernoemen.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>Bestandsnaam bevat ongeldige tekens: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Kan het bestand niet hernoemen. Zorg ervoor dat je verbonden bent met de server.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Kan het bestand niet hernoemen omdat er al een bestand met dezelfde naam op de server bestaat. Kies een andere naam.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3488,27 +3533,17 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>Bestand eindigt in spaties en kan niet hernoemd worden omdat een bestand met dezelfde naam al bestaat op de server.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>Bestand eindigt in spaties en kan niet hernoemd worden omdat een bestand met dezelfde naam lokaal al bestaat.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symbolische links worden niet ondersteund bij het synchroniseren.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Het bestand is opgenomen op de negeerlijst.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Bestandsnamen die eindigen met een punt worden niet ondersteund door het bestandssysteem.</translation> </message> @@ -3518,62 +3553,72 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Bestandsnamen met een '%1' symbool worden niet ondersteund door het bestandssysteem.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>Bestandsnamen met een "%1" symbool worden niet ondersteund door het bestandssysteem.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>De bestandsnaam bevat ten minste één ongeldig teken</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>De bestandsnaam is een gereserveerde naam op dit bestandssysteem.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>De bestandsnaam bevat spaties achteraan.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>De bestandsnaam is te lang.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Bestand/Map is genegeerd omdat het verborgen is. </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Stat mislukt.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Bestandsconflict: serverversie is gedownload, de lokale kopie is hernoemd en niet geüpload</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>De bestandsnaam kan op je bestandssysteem niet worden gecodeerd.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>De bestandsnaam staat op de negeerlijst van de server.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>Bestand heeft een extensie gereserveerd voor virtuele bestanden.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>omvang</translation> </message> @@ -3583,27 +3628,37 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>machtigingen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>Server meldde geen %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>machtiging</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>bestand id</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>Bestand eindigt in spaties en kan niet hernoemd worden omdat een bestand met dezelfde naam al bestaat op de server.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>Bestand eindigt in spaties en kan niet hernoemd worden omdat een bestand met dezelfde naam lokaal al bestaat.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>Server meldde geen %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>Server rapporteerde nr %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3613,47 +3668,47 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Conflict bij het uploaden van sommige bestanden naar een map. Die betreffende conflicterende bestanden zullen worden gewist!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Conflict bij het uploaden van een map. Het wordt opgeruimd!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Conflict bij het uploaden van een bestand. Het wordt verwijderd!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Genegeerd vanwege de "wat synchroniseren" negeerlijst</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Niet toegestaan, omdat je geen machtiging hebt om submappen aan die map toe te voegen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Niet toegestaan omdat je geen machtiging hebt om bestanden in die map toe te voegen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Verplaatst naar ongeldig doel, herstellen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Niet toegestaan om te verwijderen, herstellen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Fout bij lezen database</translation> </message> @@ -3663,7 +3718,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Server gaf een foutmelding bij lezen directory '%1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Server gaf een foutmelding bij lezen directory "%1'": %2</translation> </message> @@ -4117,7 +4172,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Kies wat te synchroniseren</translation> </message> @@ -4145,13 +4200,13 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Grootte</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Momenteel geen submappen op de server.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Er trad een fout op bij het laden van de lijst met submappen.</translation> </message> @@ -4159,12 +4214,12 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Terzijde leggen</translation> </message> @@ -4211,11 +4266,6 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>OwnCloud Pad:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Pictogram</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>label delen</translation> @@ -4226,6 +4276,11 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Nextcloud Pad:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Pictogram</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4405,27 +4460,27 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Verwijder deellink</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Bevestig verwijderen deellink</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Wil je de openbare deellink <i>%1</i> echt verwijderen?</p><p>let op: Dit kan niet ongedaan worden gemaakt.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Verwijderen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Annuleren</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Openbare Link</translation> </message> @@ -5154,12 +5209,12 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Bestandsnaamcodering is niet geldig</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Niet mogelijk om te lezen uit het synchronisatie verslag.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Kan het sync transactielog niet openen</translation> </message> @@ -5174,17 +5229,17 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>De bestandsnaam bevat ten minste één ongeldig teken</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>Synchronisatie wordt spoedig hervat.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Schijfruimte laag: Downloads die de vrije ruimte tot onder %1 zouden reduceren, zijn overgeslagen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Onvoldoende schijfruimte op de server voor sommige uploads.</translation> </message> @@ -5447,66 +5502,66 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Kan het gebruikersstatusbericht niet wissen. Zorg ervoor dat je verbonden bent met de server.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Niet wissen</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 minuten</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 uur</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 uren</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Vandaag</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Deze week</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Minder dan een minuut</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 minuut</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 minuten</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 uren</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 dag</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 dagen</translation> </message> @@ -6172,7 +6227,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Online</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6188,12 +6243,12 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_oc.ts b/translations/client_oc.ts index ca7c7a6d5..01667824d 100644 --- a/translations/client_oc.ts +++ b/translations/client_oc.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Desconnectat</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Desconnectat</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Connectat</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servidor indisponible</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Mòde mentenença</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Error de ret</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Error de configuracion</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Demanda d’identificants</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Estat del compte desconegut</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Los fichièrs de la lista d’ignorar e los ligams simbolics son pas sincronizats.</translation> </message> @@ -1563,7 +1563,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1571,24 +1571,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Suprimit totes los fichièrs ?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Suprimir totes los fichièrs</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Gardar los fichièrs</translation> </message> @@ -2465,7 +2465,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>Nom novèl de fichièr</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Renomenar fichièr</translation> </message> @@ -2476,29 +2476,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3436,27 +3481,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3466,62 +3501,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>talha</translation> </message> @@ -3531,27 +3576,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>permission</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3561,47 +3616,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3611,7 +3666,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4065,7 +4120,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Causir qué sincronizar</translation> </message> @@ -4093,13 +4148,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Talha</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation type="unfinished"/> </message> @@ -4107,12 +4162,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Regetar</translation> </message> @@ -4159,11 +4214,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Camin ownCloud :</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Icòna</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>apelacion del partatge</translation> @@ -4174,6 +4224,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Camin Nextcloud :</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Icòna</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4353,27 +4408,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirmatz la supression del ligam de partatge</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Volètz vertadièrament suprimir lo ligam public de partatge <i>%1</i> ?</p><p>Nòta : aquesta accion pòt pas èsser anullada.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Suprimir</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Anullar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Ligam public</translation> </message> @@ -5102,12 +5157,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation type="unfinished"/> </message> @@ -5122,17 +5177,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> @@ -5395,66 +5450,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Escafar pas</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 minutas</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 ora</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 oras</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Uèi</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Aquesta setmana</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Mens d’una setmana</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 minuta</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 minutas</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 oras</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 jorn</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 jorns</translation> </message> @@ -6120,7 +6175,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>En linha</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6136,12 +6191,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_pl.ts b/translations/client_pl.ts index fa1f17d71..fd3629a0c 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>Pokaż więcej akcji</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>Odrzuć</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>Otwórz okno udostępniania</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation>Plik %1 jest już zablokowany przez %2.</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation>Operacja blokady %1 nie powiodła się z powodu błędu %2</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation>Operacja odblokowania na %1 nie powiodła się z powodu błędu %2</translation> </message> @@ -752,47 +752,47 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Wylogowany</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Rozłączony</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Połączony</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Usługa niedostępna</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Tryb konserwacji</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Błąd sieci</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Błąd konfiguracji</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Zapytanie o poświadczenia</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Nieznany status konta</translation> </message> @@ -800,17 +800,17 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Aby uzyskać więcej informacji o działaniach, otwórz aplikację Aktywność.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation>Pobieranie aktywności…</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Pliki z listy ignorowanych oraz dowiązania symboliczne nie są synchronizowane.</translation> </message> @@ -1589,7 +1589,7 @@ Czy na pewno chcesz zsynchronizować te działania z serwerem? Jeśli to był przypadek i zdecydujesz się zachować swoje pliki, zostaną one przywrócone z serwera.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1600,7 +1600,7 @@ Jeśli zdecydujesz się przywrócić pliki i posiadasz odpowiednie uprawnienia, Jeśli zdecydujesz się je usunąć, nie będą już dostępne.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1609,17 +1609,17 @@ Czy na pewno chcesz zsynchronizować te działania z serwerem? Jeśli to był przypadek i zdecydujesz się zachować swoje pliki, zostaną one przywrócone z serwera.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Usunąć wszystkie pliki?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Usuń wszystkie pliki</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Zachowaj pliki</translation> </message> @@ -2502,7 +2502,7 @@ Elementy, dla których usunięcie jest dozwolone, zostaną usunięte, o ile umo <translation>Nowa nazwa pliku</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Zmień nazwę pliku</translation> </message> @@ -2513,29 +2513,74 @@ Elementy, dla których usunięcie jest dozwolone, zostaną usunięte, o ile umo </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>Następujące znaki nie są dozwolone w systemie: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>Nie masz uprawnień do zmiany nazwy tego pliku. Poproś autora pliku o zmianę jego nazwy.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>Nazwa pliku zawiera niedozwolone znaki: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Nie udało się zmienić nazwy pliku. Upewnij się, że masz połączenie z serwerem.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Nie można zmienić nazwy pliku, ponieważ plik o tej nazwie już istnieje na serwerze. Wybierz inną nazwę.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3486,27 +3531,17 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>Plik zawiera już spacje i nie można zmienić jego nazwy, ponieważ plik o tej samej nazwie już istnieje na serwerze.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>Plik zawiera już spacje i nie można zmienić jego nazwy, ponieważ plik o tej nazwie już istnieje lokalnie.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Linki symboliczne nie są obsługiwane podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Plik znajduje się na liście ignorowanych.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Nazwy plików kończące się kropką nie są obsługiwane w tym systemie plików.</translation> </message> @@ -3516,62 +3551,72 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Nazwy plików zawierające znak '%1' nie są obsługiwane w tym systemie plików.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>Nazwy plików zawierające znak "%1" nie są obsługiwane w tym systemie plików.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Nazwa pliku jest nazwą zarezerwowaną w tym systemie plików.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>Nazwa pliku zawiera na końcu spacje.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Nazwa pliku jest za długa.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Plik/katalog jest ignorowany, ponieważ jest ukryty.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Błąd statystyk.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Konflikt: Pobrano wersję z serwera, nazwa lokalnej kopii została zmieniona i nie wysłana.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>Nazwa pliku nie może być zakodowana w systemie plików.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>Nazwa pliku jest na czarnej liście na serwerze.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>Plik ma rozszerzenie zarezerwowane dla plików wirtualnych.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>rozmiar</translation> </message> @@ -3581,27 +3626,37 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>uprawnienia</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>serwer zgłosił brak %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>pozwolenie</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>id pliku</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>Plik zawiera już spacje i nie można zmienić jego nazwy, ponieważ plik o tej samej nazwie już istnieje na serwerze.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>Plik zawiera już spacje i nie można zmienić jego nazwy, ponieważ plik o tej nazwie już istnieje lokalnie.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>serwer zgłosił brak %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>Serwer zgłosił brak %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation>Nie można zsynchronizować z powodu nieprawidłowego czasu modyfikacji</translation> </message> @@ -3611,47 +3666,47 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Konflikt podczas wysyłania niektórych plików do katalogu. Konfliktowe zostaną wyjaśnione!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Konflikt podczas wysyłania katalogu. To się wyjaśni!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Konflikt podczas wysyłania pliku. Zostanie usunięty!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorowane z powodu czarnej listy "Wybierz co synchronizować"</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania podkatalogów do tego katalogu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania plików w tym katalogu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Wysyłanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Przeniesiono do nieprawidłowego obiektu, przywracanie</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Brak uprawnień by usunąć, przywracanie</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Błąd podczas odczytu bazy danych</translation> </message> @@ -3661,7 +3716,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Serwer odpowiedział z błędem podczas odczytu katalogu '%1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Serwer odpowiedział z błędem podczas odczytu katalogu "%1" : %2</translation> </message> @@ -4115,7 +4170,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Wybierz co synchronizować</translation> </message> @@ -4143,13 +4198,13 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Rozmiar</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Na serwerze nie ma w tej chwili żadnych podkatalogów.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Wystąpił błąd podczas wczytywania listy podkatalogów.</translation> </message> @@ -4157,12 +4212,12 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation>Odpowiedz</translation> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Odrzuć</translation> </message> @@ -4209,11 +4264,6 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Ścieżka ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Ikona</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>udostępnij etykietę</translation> @@ -4224,6 +4274,11 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Ścieżka Nextcloud:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Ikona</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4403,27 +4458,27 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Usuń link udostępnienia</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Potwierdź usunięcie linku udostępniania</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Czy na pewno chcesz usunąć udostępniony link publiczny <i>%1</i>?</p><p>Uwaga: Tej czynności nie można cofnąć.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Usuń</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Anuluj</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Link publiczny</translation> </message> @@ -5152,12 +5207,12 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Kodowanie nazwy pliku jest nieprawidłowe</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Nie można odczytać z dziennika synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Nie można otworzyć dziennika synchronizacji</translation> </message> @@ -5172,17 +5227,17 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>Synchronizacja zostanie wkrótce wznowiona.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Brak miejsca na dysku: Pominięto pobieranie plików, które zmniejszyłyby ilość wolnego miejsca poniżej %1.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Na serwerze nie ma wystarczającej ilości miejsca na niektóre wysłane pliki.</translation> </message> @@ -5445,66 +5500,66 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Nie udało się wyczyścić komunikatu o statusie użytkownika. Upewnij się, że masz połączenie z serwerem.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Nie czyść</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 minut</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 godzina</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 godziny</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Dzisiaj</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>W tym tygodniu</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Mniej niż minuta</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 minuta</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 minut</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%n godzin</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 dzień</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 dni</translation> </message> @@ -6170,7 +6225,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Online</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>Oznacz jako przeczytane</translation> </message> @@ -6186,12 +6241,12 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation>Odpowiedź na…</translation> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation>Wyślij odpowiedź w wiadomości na czacie</translation> </message> diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 278ca2267..c5a435eb3 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>Mostrar mais ações</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>Dispensar</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>Abrir janela de partilha</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Sessão terminada</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Desligado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Ligado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Serviço indisponível</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Modo de Manutenção</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Erro de rede</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Erro de configuração</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Perguntar Credenciais</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Estado de conta desconhecido</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1569,7 +1569,7 @@ Tem a certeza que deseja sincronizar essas ações com o servidor? Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados novamente apartir do servidor.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1577,24 +1577,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Remover todos os ficheiros?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Remover todos os ficheiros</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Manter ficheiros</translation> </message> @@ -2473,7 +2473,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Renomear ficheiro</translation> </message> @@ -2484,29 +2484,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3445,27 +3490,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3475,62 +3510,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>tamanho</translation> </message> @@ -3540,27 +3585,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>permissões</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>permissão</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3570,47 +3625,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3620,7 +3675,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4074,7 +4129,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Escolher o Que Sincronizar</translation> </message> @@ -4102,13 +4157,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Tamanho</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Atualmente não há sub-pastas no servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Ocorreu um erro ao carregar a lista das sub pastas.</translation> </message> @@ -4116,12 +4171,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Rejeitar</translation> </message> @@ -4168,11 +4223,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Caminho OwnCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Ícone</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>partilhar etiqueta</translation> @@ -4183,6 +4233,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Caminho do Nextcloud:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Ícone</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4362,27 +4417,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Apagar hiperligação de partilha</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar Eliminação do Link de Partilha</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Hiperligação Pública</translation> </message> @@ -5111,12 +5166,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Codificação de nome de ficheiro não é válida</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Não foi possível ler a partir do jornal de sincronização.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Impossível abrir o jornal de sincronismo</translation> </message> @@ -5131,17 +5186,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>O nome de ficheiro contém pelo menos um caráter inválido</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>O espaço em disco é baixo: Downloads que reduzam o espaço abaixo de %1 serão ignorados.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Não há espaço livre suficiente no servidor para alguns uploads.</translation> </message> @@ -5404,66 +5459,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 minutos</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6129,7 +6184,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6145,12 +6200,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index 39e8f7551..59d7faf3d 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>Mostrar mais ações</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>Dispensar</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>Abrir caixa de diálogo compartilhada</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation>Arquivo %1 está bloqueado por %2.</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation>Bloquear operações em %1 falhou com o erro %2</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation>Desbloquear operações em %1 falhou com o erro %2</translation> </message> @@ -752,47 +752,47 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.</tr <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Serviço indisponível</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Modo de manutenção</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Erro de rede</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Erro de configuração</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Solicitando credenciais</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Estado desconhecido da conta</translation> </message> @@ -800,17 +800,17 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.</tr <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Para mais atividades, abra o aplicativo Atividade.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation>Buscando atividades…</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Arquivos da lista de ignorados e links simbólicos não são sincronizados.</translation> </message> @@ -1589,7 +1589,7 @@ Tem certeza de que deseja sincronizar essas ações com o servidor? Se isso foi um acidente e você decidir manter seus arquivos, eles serão sincronizados novamente a partir do servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1600,24 +1600,24 @@ Se você decidir restaurar os arquivos, eles serão sincronizados novamente com Se você decidir excluir os arquivos, eles ficarão indisponíveis para você, a menos que você seja o proprietário. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation>Todos os arquivos em sua pasta de sincronização local "%1" foram excluídos. Essas exclusões serão sincronizadas com seu servidor, tornando esses arquivos indisponíveis a menos que sejam restaurados. Tem certeza de que deseja sincronizar essas ações com o servidor? Se isso foi um acidente e você decidir manter seus arquivos, eles serão sincronizados novamente a partir do servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Remover todos os arquivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Remover todos os arquivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Manter arquivos</translation> </message> @@ -2500,7 +2500,7 @@ Os itens em que a exclusão é permitida serão excluídos se impedirem a remoç <translation>Novo nome de arquivo </translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Renomear arquivo </translation> </message> @@ -2511,29 +2511,74 @@ Os itens em que a exclusão é permitida serão excluídos se impedirem a remoç </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>Os seguintes caracteres não são permitidos no sistema: * "| &?,;: \ / ~ <></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>Você não tem permissão para renomear este arquivo. Peça ao autor do arquivo para renomeá-lo. </translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>O nome do arquivo contém caracteres ilegais: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Não foi possível renomear o arquivo. Verifique se você está conectado ao servidor. </translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Não é possível renomear o arquivo porque já existe um arquivo com o mesmo nome no servidor. Escolha outro nome. </translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3484,27 +3529,17 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>O arquivo contém espaços à direita e não pôde ser renomeado, porque um arquivo com o mesmo nome já existe no servidor. </translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>O arquivo contém espaços à direita e não pôde ser renomeado, porque um arquivo com o mesmo nome já existe localmente. </translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Links simbólicos não são suportados na sincronização. </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>O arquivo está listado na lista de ignorados. </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>File names ending with a period are not supported on this file system.</translation> </message> @@ -3514,62 +3549,72 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Nomes de arquivos contendo o caracter '%1' não são suportados neste sistema de arquivos. </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>Nomes de arquivos contendo o caractere "%1" não são suportados neste sistema de arquivos. </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>O nome do arquivo contém pelo menos um caractere inválido </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>O nome do arquivo é um nome reservado neste sistema de arquivos. </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>O nome do arquivo contém espaços deixados para trás . </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>O arquivo é muito grande.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Arquivo/pasta será ignorado porque está oculto. </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Stat falhou. </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Conflito: versão do servidor baixada, cópia local renomeada e não carregada. </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>O nome do arquivo não pode ser codificado em seu sistema de arquivos. </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>O nome do arquivo está na lista negra do servidor. </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>O arquivo tem extensão reservada para arquivos virtuais. </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>tamanho</translation> </message> @@ -3579,27 +3624,37 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>permissões</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>servidor relatou não %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>permissão</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>ID do arquivo</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>O arquivo contém espaços à direita e não pôde ser renomeado, porque um arquivo com o mesmo nome já existe no servidor. </translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>O arquivo contém espaços à direita e não pôde ser renomeado, porque um arquivo com o mesmo nome já existe localmente. </translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>servidor relatou não %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>Servidor relatou não %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation>Não é possível sincronizar devido ao horário de modificação inválido</translation> </message> @@ -3609,47 +3664,47 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Conflito ao enviar alguns arquivos para uma pasta. Esses, em conflito, serão eliminados! </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Conflito ao enviar uma pasta. Vai ser limpa! </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Conflito ao enviar um arquivo. Vai ser removido! </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorado devido à lista negra "escolher o que sincronizar" </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Não permitido porque você não tem permissão para adicionar subpastas a essa pasta</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Não permitido porque você não tem permissão para adicionar arquivos nessa pasta </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Não é permitido fazer upload deste arquivo porque ele é somente leitura no servidor, restaurando </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Movido para destino inválido, restaurando </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Não tem permissão para remover, restaurar </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Erro ao ler o banco de dados </translation> </message> @@ -3659,7 +3714,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>O servidor respondeu com um erro ao ler o diretório '%1' : %2 </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>O servidor respondeu com um erro ao ler o diretório "%1" : %2</translation> </message> @@ -4113,7 +4168,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Escolher o Que Sincronizar</translation> </message> @@ -4141,13 +4196,13 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Tamanho</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Não há nenhuma subpasta no servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Ocorreu um erro enquanto carregava a lista de subpastas.</translation> </message> @@ -4155,12 +4210,12 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation>Responder</translation> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Dispensar</translation> </message> @@ -4207,11 +4262,6 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Caminho do ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Ícone</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>compartilhar rótulo</translation> @@ -4222,6 +4272,11 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Caminho Nextcloud:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Ícone</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4401,27 +4456,27 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Excluir o link de compartilhamento</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar o Link de Eliminação de Compartilhamento</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Quer mesmo excluir o link de compartilhamento público <i>%1</i>?</p><p>Nota: Esta ação não pode ser desfeita.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Excluir</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Link público</translation> </message> @@ -5150,12 +5205,12 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>A codificação do nome do arquivo é inválida</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Não é possível ler a partir do journal de sincronização.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Não é possível abrir o arquivo de sincronização</translation> </message> @@ -5170,17 +5225,17 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>O nome do arquivo contém pelo menos um caractere inválido </translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>A sincronização será retomada em breve.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>O espaço em disco é pequeno: Os downloads que reduziriam o espaço livre abaixo de %1 foram ignorados.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Não há espaço disponível no servidor para alguns envios.</translation> </message> @@ -5443,66 +5498,66 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Não foi possível limpar a mensagem de status do usuário. Certifique-se de estar conectado ao servidor.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Não limpe</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 minutos</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 hora</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 horas</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Hoje</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Est semana</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Menos de um minuto</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 minuto</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 minutos</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 horas</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 dia</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 dias</translation> </message> @@ -6168,7 +6223,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Online</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>Marcar como Lido</translation> </message> @@ -6184,12 +6239,12 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation>Responder a …</translation> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation>Enviar resposta à mensagem de bate-papo</translation> </message> diff --git a/translations/client_ro.ts b/translations/client_ro.ts index b829ba358..238e95540 100644 --- a/translations/client_ro.ts +++ b/translations/client_ro.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -752,47 +752,47 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.</ <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Deconectat</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Deconenctat</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Conectat</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Serviciu indisponibil</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Mod mentenanță</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Eroare de rețea</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Eroare de configurare</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Întrebare despre acreditări</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Nu se cunoaște starea contului</translation> </message> @@ -800,17 +800,17 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.</ <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Pentru mai multe activități vă rugăm deschideți aplicația de activități.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Fișierele din lista de ignorare precum și legăturile simbolice nu sunt sincronizate.</translation> </message> @@ -1583,7 +1583,7 @@ Ești sigur că dorești să sincronizezi toate aceste acțiuni cu serverul ? Dacă această acțiune a fost un accident și dorești să pastrezi fișierele, acestea pot fi resincronizate de pe server.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1591,24 +1591,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Ștergeți toate fișierele ?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Șterge toate fișierele</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Păstrează fișierele</translation> </message> @@ -2485,7 +2485,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2496,29 +2496,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3456,27 +3501,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3486,62 +3521,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3551,27 +3596,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3581,47 +3636,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3631,7 +3686,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4085,7 +4140,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation type="unfinished"/> </message> @@ -4113,13 +4168,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Mărime</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation type="unfinished"/> </message> @@ -4127,12 +4182,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Înlătură</translation> </message> @@ -4179,11 +4234,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Pictogramă</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>partajază eticheta</translation> @@ -4194,6 +4244,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Pictogramă</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4373,27 +4428,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Șterge linkul partajat</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Șterge</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Anulează</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Link public</translation> </message> @@ -5120,12 +5175,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation type="unfinished"/> </message> @@ -5140,17 +5195,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Numele fișierului conține cel puțin un caracter invalid</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> @@ -5413,66 +5468,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6138,7 +6193,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6154,12 +6209,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index 706404baf..52f824bb8 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>Показывать больше действий</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>Отказать</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>Открыть диалоговое окно общего доступа</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -751,47 +751,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Выполнен выход из учётной записи</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Отключено</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Подключено</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Сервис недоступен</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Режим технического обслуживания.</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Ошибка сети</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Ошибка конфигурации</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Запрос учётных данных</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Неизвестное состояние учетной записи</translation> </message> @@ -799,17 +799,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Вся история доступна в приложении «События».</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Из синхронизации исключены символьные ссылки и файлы, попадающие под правила из списка игнорируемых файлов.</translation> </message> @@ -1585,7 +1585,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Если это произошло случайно, и вы решите сохранить файлы, они будут повторно скачаны с сервера.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1596,7 +1596,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a При выборе «Удалить файлы», файлы станут недоступны, кроме случая, когда вы являетесь их владельцем.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1605,17 +1605,17 @@ If this was an accident and you decide to keep your files, they will be re-synce Если это произошло случайно, и вы решите сохранить файлы, они будут повторно скачаны с сервера.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Удалить все файлы?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Удалить все файлы</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Сохранить файлы</translation> </message> @@ -2497,7 +2497,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>Новое имя файла</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Переименуйте файл</translation> </message> @@ -2508,29 +2508,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>В системе запрещены следующие символы: * "| &?,;: \ / ~ <></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>У вас нет разрешения на переименование этого файла. Попросите автора файла переименовать его.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>Имя файла содержит недопустимые символы: % 1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Не удалось переименовать файл. Убедитесь, что вы подключены к серверу.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Невозможно переименовать файл, поскольку файл с таким именем уже существует на сервере. Пожалуйста, выберите другое имя.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3481,27 +3526,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>Файл содержит конечные пробелы и не может быть переименован, поскольку файл с таким именем уже существует на сервере.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>Файл содержит конечные пробелы и не может быть переименован, поскольку файл с таким именем уже существует локально.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Синхронизация символических ссылок не поддерживается.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Файл присутствует в списке исключений из сихнронизации.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Используемая файловая система не поддерживает имена файлов, оканчивающиеся на точку.</translation> </message> @@ -3511,62 +3546,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Используемая файловая система не поддерживает имена файлов, содержащие символ «%1».</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>Используемая файловая система не поддерживает имена файлов, содержащие символ «%1».</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Имя файла содержит по крайней мере один некорректный символ</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Имя файла является зарезервированным внутренним именем в используемой файловой системе.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>Имя файла содержит пробелы на конце.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Имя файла слишком длинное.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Файл или папка исключены из синхронизации, так как являются скрытыми.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Ошибка вызова функции stat.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Конфликт: загружена версия файла с сервера, а локальная копия переименована и не передана на сервер.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>Имя файла не может быть закодировано для используемой файловой системы.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>Имя файла внесено в чёрный список на сервере.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>Расширение файла является зарезервированным для виртуальных файлов.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>размер</translation> </message> @@ -3576,27 +3621,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>права доступа</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>ответ сервера: %1 отсуствует</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>разрешение</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>id файла</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>Файл содержит конечные пробелы и не может быть переименован, поскольку файл с таким именем уже существует на сервере.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>Файл содержит конечные пробелы и не может быть переименован, поскольку файл с таким именем уже существует локально.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>ответ сервера: %1 отсуствует</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>Сервер сообщил об отсутствии %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3606,47 +3661,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Передача файлов в папку на сервере привела к конфликту версий. Файлы, вызвавшие конфликт версий, будут удалены.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Передача папки на сервер привела к конфликту версии. Папка, вызвавшая конфликт версии, будет удалена.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Передача файла на сервер привела к конфликту версии. Файл, вызвавший конфликт версии, будет удалён.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Игнорируется из-за совпадения с записью в списке исключений из синхронизации</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Недостаточно прав для создания вложенных папок</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Недостаточно прав для создания файлов в этой папке</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Передача этого файла на сервер не разрешена, т.к. он доступен только для чтения, выполняется восстановление</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Перемещено в некорректное расположение, выполняется восстановление</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Удаление недопустимо, выполняется восстановление</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Ошибка чтения базы данных</translation> </message> @@ -3656,7 +3711,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ошибка сервера при попытке прочитать каталог «%1»: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Ошибка сервера при попытке прочитать каталог «%1»: %2</translation> </message> @@ -4110,7 +4165,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Уточнить объекты</translation> </message> @@ -4138,13 +4193,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Размер</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Сейчас на сервере нет вложенных папок.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Ошибка получения списка вложенных папок.</translation> </message> @@ -4152,12 +4207,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Отклонить</translation> </message> @@ -4204,11 +4259,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Путь ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Значок</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>поделиться меткой</translation> @@ -4219,6 +4269,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Расположение Nextcloud:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Значок</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4398,27 +4453,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Удалить ссылку</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Подтверждение закрытия доступа по ссылке</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Действительно закрыть доступ по ссылке «<i>%1</i>»?</p><p>Внимание: это действие будет невозможно отменить.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Удалить</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Общедоступная ссылка</translation> </message> @@ -5147,12 +5202,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Кодировка имени файла не верна</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Не удалось прочитать из журнала синхронизации.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Не удаётся открыть журнал синхронизации</translation> </message> @@ -5167,17 +5222,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Имя файла содержит по крайней мере один некорректный символ</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>Синхронизация возобновится в ближайшее время.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Мало места на диске: Скачивания, которые сократят свободное место ниже %1, будут пропущены.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>На сервере недостаточно места для некоторых закачек.</translation> </message> @@ -5440,66 +5495,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Не удалось удалить описание статуса на сервере. Убедитесь, что подключение установлено.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Не очищать</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 минут</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 час</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 часа</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Сегодня</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>На этой неделе</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Меньше минуты</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>Одна минута</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%n минут(ы)</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%n часов(а)</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 день</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%n дней</translation> </message> @@ -6165,7 +6220,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>В сети</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>Отметить как прочитанное</translation> </message> @@ -6181,12 +6236,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_sc.ts b/translations/client_sc.ts index 594f17a55..a8137b45e 100644 --- a/translations/client_sc.ts +++ b/translations/client_sc.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -752,47 +752,47 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.</ <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Essidu</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Disconnètidu</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Connètidu</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Servìtziu no a disponimentu</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Modalidade mantenidura</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Errore de rete</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Ddoe at àpidu un'errore de cunfiguratzione</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Rechesta credentziales</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Istadu de su contu disconnotu</translation> </message> @@ -800,17 +800,17 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.</ <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Pro àteras atividades, pro praghere, aberi s'aplicatzione Activity. </translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Is archìvios de s'elencu de non tènnere in contu gasi comente is ligòngios non sunt sincronizados.</translation> </message> @@ -1589,7 +1589,7 @@ Ses seguru chi boles sincronizare custas atziones cun su serbidore? Si custu fiat un'errore e detzides de mantènnere is archìvios tuos, custos ddos at a torrare a sincronizare su serbidore.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1600,7 +1600,7 @@ Si detzides de ripristinare is archìvios, custos ant a èssere sincronizados to Si detzides de cantzellare is archìvios, non ant a èssere prus a disponimentu, francu chi sias tue su mere.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1610,17 +1610,17 @@ Ses seguru chi boles sincronizare custas atziones cun su serbidore? Si custu fiat un'errore e detzides de mantènnere is archìvios tuos, custos ddos at a torrare a sincronizare su serbidore.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Boles bogare totu is archìvios?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Boga totu is archìvios?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Mantene is archìvios</translation> </message> @@ -2503,7 +2503,7 @@ Is elementos in ue est permitidu ant a èssere cantzellados si impedint de catza <translation>Nùmene nou de s'archìviu</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Torra a numenare s'archìviu</translation> </message> @@ -2514,29 +2514,74 @@ Is elementos in ue est permitidu ant a èssere cantzellados si impedint de catza </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>Custos caràteres no sunt permìtidos in su sistema: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>No tenes su permissu de torrare a numenare cust'archìviu. Pedi a chie at creadu s'archìviu de ddu torrare a numenare.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>Su nùmene de s'archìviu cuntenet caràteres no amìtidos: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>No at fatu a torrare a numenare s'archìviu. Controlla si tenes connessione a su serbidore.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>No at fatu a torrare a numenare s'archìviu, ca in su serbidore nd'at giai un'àteru cun su matessi nùmene. Sèbera un'àteru nùmene.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3485,27 +3530,17 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Is ligòngios simbòlicos non sunt suportados in sa sincronizatzione.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Archìviu postu in s'elencu de is ignorados.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Is nùmenes chi agabbant cun unu puntu non sunt suportados in custu archìviu de sistema.</translation> </message> @@ -3515,62 +3550,72 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Is archìvios cun in intro su caràtere '%1' non sunt suportados in custu archìviu de su sistema.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>Is archìvios cun in intro su caràtere "%1" non sunt suportados in custu archìviu de su sistema.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Su nùmene de su'archìviu tenet a su mancu unu caràtere non bàlidu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Su nùmene de s'archìviu est unu nùmene riservadu a custu archìviu de sistema.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>Su nùmene de s'archìviu cuntenet tretos a sa fine.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Su nùmene de s'archìviu est tropu longu.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>S'archìviu/cartella ignoradu ca cuadu.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Stat faddida.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Cunflitu: versione de su serbidore iscarrigada, còpia locale torrada a numenare e non carrigada.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>Su nùmene de s'archìviu non podet èssere codificada in s'archìviu tuo de sistema.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>Su nùmene de s'archìviu est in sa lista niedda de su serbidore.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>S'archìviu at un'estensione riservada a is archìvios virtuales.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>mannària</translation> </message> @@ -3580,27 +3625,37 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>permissos</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>su serbidore no at torradu perunu %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>id de s'archìviu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>su serbidore no at torradu perunu %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3610,47 +3665,47 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>B'at un'iscòrriu carrighende unos archìvios a sa cartella. Cussos in iscòrriu ant a èssere cantzellados!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Iscòrriu carrighende una cartella. Custa s'at a cantzellare!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Iscòrriu carrighende un'archìviu. Custu s'at a cantzellare!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignoradu ca in sa lista niedda de is cosas de no sincronizare</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Non podes ca non tenes su permissu pro agiùnghere sutacartellas a custas cartellas</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation> Non podes ca non tenes su permissu pro agiùnghere archìvios a custa cartella</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Non podes carrigare custu archìviu ca in su serbidore podes isceti lèghere, riprìstinu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Tramudadu a un'indiritzu non bàlidu, riprìstinu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Non ddu podes bogare, riprìstinu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Errore leghende sa base de datos</translation> </message> @@ -3660,7 +3715,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Su serbidore at dadu errore leghende sa cartella '%1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Su serbidore nd'at torradu un'errore leghende sa cartella "%1" : %2</translation> </message> @@ -4114,7 +4169,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Sèbera ite sincronizare:</translation> </message> @@ -4142,13 +4197,13 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Mannària</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Peruna sutacartella immoe in su serbidore.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>B'at àpidu un'errore carrighende sa lista de suta cartellas.</translation> </message> @@ -4156,12 +4211,12 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Annulla</translation> </message> @@ -4208,11 +4263,6 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>caminu de ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Maginedda</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>eticheta de cumpartzidura</translation> @@ -4223,6 +4273,11 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Caminu de Nextcloud:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Maginedda</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4402,27 +4457,27 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Cantzella ligòngiu de cumpartzidura</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Cunfirma de cantzellare su ligòngiu</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>A beru nche boles cantzellare sa cumpartzidura a su ligòngiu pùblicu<i>%1</i>?</p><p>Avisu: custa operatzione non si podet annullare.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Cantzella</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Annulla</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Ligòngiu pùblicu</translation> </message> @@ -5151,12 +5206,12 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Codìfica de su nùmene de s'archìviu non bàlida.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>No at fatu a lèghere dae su registru de sincronizatzione.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Non faghet a abèrrerer su registru de sincronizatzione</translation> </message> @@ -5171,17 +5226,17 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Su nùmene de s'archìviu cuntenet a su mancu unu caràtere imbàlidu</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation> Su logu in su discu est pagu: is iscarrigamentos chi diant pòdere minimare su logu lìberu suta de %1 s'ant a lassare.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Non b'at logu in su serbidore pro unos cantos carrigamentos. </translation> </message> @@ -5444,66 +5499,66 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>No at fatu a limpiare su messàgiu de istadu de s'utente. Controlla si tenes connessione a su serbidore.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Non nche ddu lìmpies</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 minutos</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 ora</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 oras</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Oe</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Custa chida</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Mancu unu minutu a immoe</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 minutu</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 minutos</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 oras</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 die</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 dies</translation> </message> @@ -6169,7 +6224,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>In lìnia</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6185,12 +6240,12 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_sk.ts b/translations/client_sk.ts index b63ea1a7f..48ca20c47 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>Zobraziť ďalšie akcie</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>Odmietnuť</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>Otvoriť dialógové okno zdieľania</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation>Súbor %1 je už uzamknutý od %2.</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -752,47 +752,47 @@ Táto akcia zruší všetky prebiehajúce synchronizácie.</translation> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Odhlásené</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Odpojené</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Pripojené</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Služba nedostupná</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Mód údržby</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Chyba siete</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Chyba nastavenia</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Zisťujem prihlasovacie údaje</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Neznámy stav účtu</translation> </message> @@ -800,17 +800,17 @@ Táto akcia zruší všetky prebiehajúce synchronizácie.</translation> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Pre viac aktivít otvorte aplikáciu Aktivity.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation>Získavam aktivity...</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Súbory zo zoznamu ignorovaných ako aj symbolické linky sa nesynchronizujú.</translation> </message> @@ -1589,7 +1589,7 @@ Ste si istí, že chcete tieto akcie synchronizovať so serverom? Ak to bol omyl a rozhodnete sa tieto súbory ponechať, budú opäť synchronizované zo servera.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1600,7 +1600,7 @@ Ak sa rozhodnete lokálne súbory ponechať, budú znovu synchronizované so ser Ak sa rozhodnete súbory vymazať tak následne už nebudú dostupné, ak nie ste vlastník.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1609,17 +1609,17 @@ Ste si istí, že chcete tieto akcie synchronizovať so serverom? Ak to bol omyl a rozhodnete sa tieto súbory ponechať, budú opäť synchronizované zo servera.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Odstrániť všetky súbory?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Odstrániť všetky súbory</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Ponechať súbory</translation> </message> @@ -2502,7 +2502,7 @@ Položky, pri ktorých je povolené odstraňovanie sa vymažú, ak bránia odstr <translation>Nový názov súboru</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Premenovať súbor</translation> </message> @@ -2513,29 +2513,74 @@ Položky, pri ktorých je povolené odstraňovanie sa vymažú, ak bránia odstr </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>Nasledujúce znaky nie sú na systéme povolené: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>Nemáte oprávnenie premenovať tento súbor. Prosím požiadajte vlastníka súboru o premenovanie.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>Názov súboru obsahuje neplatné znaky: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Nemôžem premenovať súbor. Prosím uistite sa že ste pripojený k serveru.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Nemôžem premenovať súbor pretože súbor s rovnakým menom už na serveri existuje. Prosím vyberte iné meno.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3485,27 +3530,17 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>Súbor obsahuje medzery na konci a nemožno ho premenovať, pretože súbor s rovnakým názvom už na serveri existuje.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>Súbor obsahuje medzery na konci a nemožno ho premenovať, pretože súbor s rovnakým názvom už lokálne existuje.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symbolické odkazy nie sú podporované pri synchronizácii.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Súbor je zapísaný na zozname ignorovaných.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Názvy súborov končiacich bodkou nie sú na tomto súborovom systéme podporované.</translation> </message> @@ -3515,62 +3550,72 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Názvy súborov obsahujúce znak "%1" nie sú na tomto súborovom systéme podporované.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>Názvy súborov obsahujúce znak "%1" nie sú na tomto súborovom systéme podporované.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Názov súboru obsahuje nepovolený znak</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Názov súboru je na tomto súborovom systéme rezervovaným názvom.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>Názov súboru obsahuje medzery na konci.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Meno súboru je veľmi dlhé.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Súbor/priečinok je ignorovaný, pretože je skrytý</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Nepodarilo sa získať informácie o súbore.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Konflikt: Prevzatá verzia zo servera, lokálna kópia premenovaná a neodovzdaná.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>Názov súboru nemôže byť na tomto súborovom systéme enkódovaný.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>Súbor je na tomto serveri na čiernej listine.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>Prípona súboru je rezervovaná pre virtuálne súbory.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>veľkosť</translation> </message> @@ -3580,27 +3625,37 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>oprávnenia</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>server nevrátil žiadne %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>oprávnenie</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>id súboru</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>Súbor obsahuje medzery na konci a nemožno ho premenovať, pretože súbor s rovnakým názvom už na serveri existuje.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>Súbor obsahuje medzery na konci a nemožno ho premenovať, pretože súbor s rovnakým názvom už lokálne existuje.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>server nevrátil žiadne %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>Server nevrátil žiadne %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3610,47 +3665,47 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Konflikt pri nahrávaní niektorých súborov do priečinka. Konfliktné súbory budú odstránené!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Konflikt pri nahrávaní priečinka. Bude odstránený!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Konflikt pri nahrávaní súboru. Bude odstránený!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorované podľa nastavenia "vybrať čo synchronizovať"</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Nie je dovolené, lebo nemáte oprávnenie pridávať podpriečinky do tohto priečinka</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Nie je možné, pretože nemáte oprávnenie pridávať súbory do tohto priečinka</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Nie je dovolené tento súbor nahrať, pretože je na serveri iba na čítanie, obnovujem</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Presunuté do neplatného cieľa, obnovujem</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Nie je dovolené odstrániť, obnovujem</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Chyba pri čítaní z databáze</translation> </message> @@ -3660,7 +3715,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Server odpovedal chybne počas čítania adresára '%1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Server odpovedal chybne počas načítania priečinka "%1" : %2</translation> </message> @@ -4114,7 +4169,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Vybrať čo synchronizovať</translation> </message> @@ -4142,13 +4197,13 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Veľkosť</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Na serveri teraz nie sú žiadne podpriečinky.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Počas načítavania zoznamu podpriečinkov sa vyskytla chyba.</translation> </message> @@ -4156,12 +4211,12 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation>Odpovedať</translation> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Odmietnuť</translation> </message> @@ -4208,11 +4263,6 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>ownCloud cesta:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Ikona</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>zdieľať značku</translation> @@ -4223,6 +4273,11 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Cesta Nextcloud:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Ikona</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4402,27 +4457,27 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Zmazať sprístupnený odkaz</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Potvrdzovať rušenie sprístupnenia</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Naozaj chcete vymazať odkaz pre verejné sprístupnenie <i>%1</i>?</p><p>Pozn.: túto akciu nie je možné vrátiť späť.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Zmazať</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Zrušiť</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Verejný odkaz</translation> </message> @@ -5151,12 +5206,12 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Kódovanie znakov názvu súboru je neplatné</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Nemožno čítať zo synchronizačného žurnálu</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Nemožno otvoriť sync žurnál</translation> </message> @@ -5171,17 +5226,17 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Názov súboru obsahuje nevhodný znak</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>Synchronizácia bude čoskoro pokračovať.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Na disku dochádza voľné miesto. Sťahovanie, ktoré by zmenšilo voľné miesto pod %1 bude vynechané.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Na serveri nie je pre niektoré z nahrávaných súborov dostatok voľného miesta.</translation> </message> @@ -5444,66 +5499,66 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Nemôžem vymazať stav uživateľa. Uistite sa že ste pripojený k serveru.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Nemazať</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 minút</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 hodina</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 hodiny</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Dnes</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Tento týždeň</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Menej ako minúta</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 minúta</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 minút</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 hodín</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 deň</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 dní</translation> </message> @@ -6169,7 +6224,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Pripojený</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>Označiť ako prečítané</translation> </message> @@ -6185,12 +6240,12 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation>Odpovedať na ...</translation> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation>Odoslať odpoveď do správy v rozhovoroch</translation> </message> diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 6ba001b77..97be0b636 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -752,47 +752,47 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.</trans <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Odjavljeno</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Brez povezave</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Povezano</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Storitev ni na voljo</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Vzdrževalni način</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Omrežna napaka</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Napaka nastavitve</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Zahteva po poverilih</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Neznano stanje računa</translation> </message> @@ -800,17 +800,17 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.</trans <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Za izpis več dejavnosti odprite program Dejavnost</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Datoteke, ki so na seznamu neusklajevanja, in simbolne povezave se ne usklajujejo.</translation> </message> @@ -1589,7 +1589,7 @@ Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1600,7 +1600,7 @@ V kolikor se odločite te datoteke ohraniti, in so na voljo ustrezna dovoljenja, Nasprotno, če potrdite izbris in niste lastnik datotek, te ne bodo več dosegljive.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1609,17 +1609,17 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom? Če je prišlo do napake in se odločite datoteke ohraniti, bodo te ponovno usklajene s strežnika.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Ali naj bodo odstranjene vse datoteke?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Odstrani vse datoteke</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Ohrani datoteke</translation> </message> @@ -2502,7 +2502,7 @@ Predmeti v mapah, ki jih je dovoljeno izbrisati, bodo odstranjeni, če prepreču <translation>Novo ime datoteke</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Preimenuj datoteko</translation> </message> @@ -2513,29 +2513,74 @@ Predmeti v mapah, ki jih je dovoljeno izbrisati, bodo odstranjeni, če prepreču </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>Na tem sistemu niso dovoljeni znaki: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>Za preimenovanje te datoteke ni ustreznih dovoljenj. Datoteko lahko spremeni le avtor.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>V imenu datoteke so neveljavni znaki: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Datoteke ni mogoče preimenovati. Prepričajte se, da ste povezani s strežnikom.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Datoteke ni mogoče preimenovati, ker datoteka z istim imenom na strežniku že obstaja. Izbrati je treba drugo ime.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3484,27 +3529,17 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>Ime datoteke vsebuje nepotrebne končne presledke in ga ni mogoče preimenovati, saj datoteka z istim imenom na strežniku že obstaja.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>Ime datoteke vsebuje nepotrebne končne presledke in ga ni mogoče preimenovati, saj datoteka z istim imenom krajevno že obstaja.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Usklajevanje simbolnih povezav ni podprto.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Datoteka je na seznamu neusklajevanih datotek.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Imena datotek, ki vsebujejo končno piko, na tem sistemu niso podprta.</translation> </message> @@ -3514,62 +3549,72 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Imena datotek, ki vsebujejo znak »%1«, na tem sistemu niso podprta.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>Imena datotek, ki vsebujejo znak »%1«, na tem sistemu niso podprta.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Ime datoteke vsebuje vsaj en neveljaven znak.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Ime datoteke je na tem sistemu zadržano za sistemsko datoteko.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>Datoteka vsebuje pripete presledne znake.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Ime datoteke je predolgo.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Datoteka/Mapa ni usklajevana, ker je skrita.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Določanje stanja je spodletelo.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Spor: prejeta je strežniška različica, krajevna je preimenovana, a ne tudi poslana v oblak. </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>Zapisa imena datoteke na tem datotečnem sistemu ni mogoče kodirati.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>Ime datoteke je na črnem seznamu strežnika.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>Datoteka ima predpono, ki je zadržana za navidezne datoteke.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>velikost</translation> </message> @@ -3579,27 +3624,37 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>dovoljenja</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>prejet je odziv strežnika %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>dovoljenje</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>ID datoteke</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>Ime datoteke vsebuje nepotrebne končne presledke in ga ni mogoče preimenovati, saj datoteka z istim imenom na strežniku že obstaja.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>Ime datoteke vsebuje nepotrebne končne presledke in ga ni mogoče preimenovati, saj datoteka z istim imenom krajevno že obstaja.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>prejet je odziv strežnika %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>Prejet je odziv strežnika %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3609,47 +3664,47 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Zaznan je spor pri nalaganju nekaterih datotek v mapo. Spori bodo samodejno počiščeni!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Zaznan je spor pri pošiljanju mape. Mapa bo počiščena!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Zaznan je spor pri pošiljanju datoteke. Datoteka bo odstranjena!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Predmet ni usklajevan, ker je na »črnem seznamu datotek« za usklajevanje</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Dejanje ni dovoljeno! Ni ustreznih dovoljenj za dodajanje podmap v to mapo.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Dejanje ni dovoljeno, ker ni ustreznih dovoljenj za dodajanje datotek v to mapo</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Te datoteke ni dovoljeno poslati, ker ima določena dovoljenja le za branje. Datoteka bo obnovljena na izvorno različico.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Predmet je premaknjen na neveljaven cilj, vsebina bo obnovljena.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Odstranjevanje ni dovoljeno, vsebina bo obnovljena.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Napaka branja podatkovne zbirke</translation> </message> @@ -3659,7 +3714,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Odziv strežnika vključuje napako med branjem mape »%1«: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Odziv strežnika vključuje napako med branjem mape »%1«: %2</translation> </message> @@ -4113,7 +4168,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Izbor map za usklajevanje</translation> </message> @@ -4141,13 +4196,13 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Velikost</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Na strežniku trenutno ni podrejenih map.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Prišlo je do napake med nalaganjem seznama podrejenih map.</translation> </message> @@ -4155,12 +4210,12 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Opusti</translation> </message> @@ -4207,11 +4262,6 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Pot do OwnCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Ikona</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>deli oznako</translation> @@ -4222,6 +4272,11 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Pot Nextcloud:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Ikona</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4401,27 +4456,27 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Izbriši povezavo za souporabo</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Potrdi brisanje povezave do mesta souporabe</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Ali res želite izbrisati javno povezavo do mesta souporabe <i>%1</i>?</p><p>Opomba: opravila ni mogoče povrniti.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Izbriši</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Prekliči</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Javna povezava</translation> </message> @@ -5150,12 +5205,12 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Kodni zapis imena datoteke ni veljaven.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Ni mogoče brati iz dnevnika usklajevanja</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Ni mogoče odpreti dnevnika usklajevanja</translation> </message> @@ -5170,17 +5225,17 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Ime datoteke vsebuje vsaj en neveljaven znak.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>Usklajevanje se bo v kratkem nadaljevalo.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Zmanjkuje prostora na disku: prejem predmetov, ki bi zmanjšali prostor na disku pod %1 bo prekinjen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Za usklajevanje je na strežniku premalo prostora.</translation> </message> @@ -5443,66 +5498,66 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Sporočila o stanju uporabnika ni bilo mogoče izbrisati. Prepričajte se, da ste povezani s strežnikom.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Ne počisti</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 minut</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 ura</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 ure</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Danes</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Ta teden</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Manj kot minuta</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 minuta</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 minut</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 ur</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 dan</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 dni</translation> </message> @@ -6168,7 +6223,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Na voljo</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6184,12 +6239,12 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 7e3df416e..4ededa4cd 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -748,47 +748,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Одјављен</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Неповезан</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Повезан</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Услуга није доступна</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Режим одржавања</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Грешка мреже</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Грешка подешавања</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Питам за акредитиве</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Непознато стање налога</translation> </message> @@ -796,17 +796,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>За још активности отворите апликацију Активности.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1583,7 +1583,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Ако је ово била грешка и желите да задржите фајлове, они ће се поновно синхронизовати са сервера.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1591,24 +1591,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Уклонити све фајлове?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Уклони све фајлове</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Остави фајлове</translation> </message> @@ -2489,7 +2489,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2500,29 +2500,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3464,27 +3509,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3494,62 +3529,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3559,27 +3604,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3589,47 +3644,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3639,7 +3694,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4093,7 +4148,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Изаберите шта синхронизовати</translation> </message> @@ -4121,13 +4176,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>величина</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>На серверу тренутно нема потфасцикли.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Десила се грешка приликом учитавања листе подфасцикли</translation> </message> @@ -4135,12 +4190,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Откажи</translation> </message> @@ -4187,11 +4242,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>оунКлауд путања:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Икона</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>ознака дељења</translation> @@ -4202,6 +4252,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Некстклауд путања:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Икона</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4381,27 +4436,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Обриши везу дељења</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Потврдите брисање везе дељења</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Да ли стварно желите да обришете јавну везу дељења <i>%1</i>?</p><p>Белешка: ово је неповратна операција.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Обриши</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Откажи</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Јавна веза</translation> </message> @@ -5130,12 +5185,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Кодирање назива фајла није исправно</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Не могу да читам синхронизациони журнал.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Не могу да отворим журнал синхронизације</translation> </message> @@ -5150,17 +5205,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Назив садржи бар један недозвољен карактер</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Мало простора на диску: преузимања која би смањила слободно место испод %1 су прескочена.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Нема довољно места на серверу за нека отпремања.</translation> </message> @@ -5423,66 +5478,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6148,7 +6203,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6164,12 +6219,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 870ca1409..0d966b58c 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -748,47 +748,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Utloggad</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Bortkopplad</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Ansluten</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Tjänsten är inte tillgänglig</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Underhållsläge</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Nätverksfel</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Konfigurationsfel</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Frågar efter inloggningsuppgifter</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Okänd kontostatus</translation> </message> @@ -796,17 +796,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Öppna Aktivitetsappen för fler aktiviteter.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Filer från ignorerings-listan och symboliska länkar synkroniseras inte.</translation> </message> @@ -1585,7 +1585,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Om detta var ett misstag och du vill behålla dina filer, kommer de att synkroniseras på nytt från servern.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1593,24 +1593,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Ta bort alla filer?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Ta bort alla filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Behåll filer</translation> </message> @@ -2491,7 +2491,7 @@ Objekt där radering är tillåtet raderas om de förhindrar att en mapp tas bor <translation>Nytt filnamn</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Byt filnamn</translation> </message> @@ -2502,29 +2502,74 @@ Objekt där radering är tillåtet raderas om de förhindrar att en mapp tas bor </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>Filnamnet innehåller ogiltiga tecken: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Kunde inte byta namn på filen. Kontrollera anslutningen till servern.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Kunde inte byta namn på filen eftersom filnamnet är upptaget. Ange ett annat filnamn.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3466,27 +3511,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>Filen innehåller inledande mellanslag och kunde inte döpas om eftersom en fil med samma namn redan existerar på servern.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>Filen innehåller inledande mellanslag och kunde inte döpas om eftersom en fil med samma namn redan existerar lokalt.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symboliska länkar kan ej synkroniseras.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Filen är listad i undantagslistan.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Filnamn som slutar med en punkt stöds inte på detta filsystem.</translation> </message> @@ -3496,62 +3531,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Filnamn innehållandes tecknet "%1' stöds inte på detta filsystem.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>ilnamn innehållandes tecknet "%1"' stöds inte på detta filsystem.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Filnamnet innehåller minst ett ogiltigt tecken</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Detta filnamn är reserverat på detta filsystem.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>Filnamnet innehåller inledande blanksteg.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Filnamnet är för långt.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Filen/mappen ignoreras eftersom den är dold.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>Filnamnet kan inte avkodas på ditt filsystem.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>Filnamnet är svartlistat på servern.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>Filens ändelse är reserverad för virtuella filer.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>storlek</translation> </message> @@ -3561,27 +3606,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>behörigheter</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>servern svarade inte %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>behörighet</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>fil-ID</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>Filen innehåller inledande mellanslag och kunde inte döpas om eftersom en fil med samma namn redan existerar på servern.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>Filen innehåller inledande mellanslag och kunde inte döpas om eftersom en fil med samma namn redan existerar lokalt.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>servern svarade inte %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>Servern svarade inte %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3591,47 +3646,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Borttagning tillåts ej, återställer</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Fel uppstod när databasen skulle läsas</translation> </message> @@ -3641,7 +3696,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4095,7 +4150,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Välj vad som ska synkroniseras</translation> </message> @@ -4123,13 +4178,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Storlek</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Inga undermappar på servern för närvarande.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Ett fel uppstod när listan för submappar lästes in.</translation> </message> @@ -4137,12 +4192,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Avfärda</translation> </message> @@ -4189,11 +4244,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Sökväg till ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Ikon</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>delningsetikett</translation> @@ -4204,6 +4254,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nextcloud-plats:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Ikon</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4383,27 +4438,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ta bort delad länk</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Bekräfta radering av delad länk</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Vill du verkligen radera den publikt delade länken <i>%1</i>?</p><p>Obs: Den här åtgärden kan inte ångras.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Ta bort</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Publik länk</translation> </message> @@ -5132,12 +5187,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Filnamnskodning är inte giltig</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Det går inte att läsa från synkroniseringsjournalen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Det går inte att öppna synkroniseringsjournalen</translation> </message> @@ -5152,17 +5207,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Filnamnet innehåller minst ett ogiltigt tecken</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Diskutrymmet är lågt: Hämtningar som skulle reducera det fria utrymmet under %1 hoppas över.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Det finns inte tillräckligt med utrymme på servern för vissa uppladdningar.</translation> </message> @@ -5425,66 +5480,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Kunde inte rensa status. Kontrollera anslutningen till servern.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Rensa inte</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 minuter</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 timme</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 timmar</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Idag</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Denna vecka</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>Mindre än en minut</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 minut</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 minuier</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 timmar</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 dag</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 dagar</translation> </message> @@ -6150,7 +6205,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Online</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6166,12 +6221,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_th.ts b/translations/client_th.ts index 89e0d1625..0fb5fb303 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -747,47 +747,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>ออกจากระบบแล้ว</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>ไม่ได้เชื่อมต่อ</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>เชื่อมต่อแล้ว</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>บริการไม่พร้อมใช้งาน</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>โหมดการบำรุงรักษา</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>ข้อผิดพลาดเครือข่าย</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>การกำหนดค่าผิดพลาด</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>กำลังขอข้อมูลประจำตัว</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>ไม่ทราบสถานะบัญชี</translation> </message> @@ -795,17 +795,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1572,7 +1572,7 @@ If this was an accident and you decide to keep your files, they will be re-synce ถ้าเรื่องนี้เป็นอุบัติเหตุและคุณตัดสินใจที่จะเก็บไฟล์ของคุณ ไฟล์ของคุณก็จะถูกประสานข้อมูลใหม่อีกครั้ง</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1580,24 +1580,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>ลบไฟล์ทั้งหมด?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>ลบไฟล์ทั้งหมด</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>เก็บไฟล์เอาไว้</translation> </message> @@ -2476,7 +2476,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2487,29 +2487,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3447,27 +3492,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3477,62 +3512,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3542,27 +3587,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3572,47 +3627,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3622,7 +3677,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4076,7 +4131,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>เลือกสิ่งที่จะซิงค์</translation> </message> @@ -4104,13 +4159,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ขนาด</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>ไม่มีโฟลเดอร์ย่อยอยู่บนเซิร์ฟเวอร์</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>เกิดข้อผิดพลาดขณะโหลดรายชื่อของโฟลเดอร์ย่อย</translation> </message> @@ -4118,12 +4173,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>ยกเลิก</translation> </message> @@ -4170,11 +4225,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>พาธ ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>แชร์ป้ายกำกับ</translation> @@ -4185,6 +4235,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4364,27 +4419,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>ยืนยันการลบลิงค์ที่แชร์</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>คุณต้องการลบลิงค์ที่แชร์แบบสาธารณะ<i>%1</i>?</p><p>หมายเหตุ: ไม่สามารถยกเลิกการดำเนินการนี้ได้</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>ลบ</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>ยกเลิก</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>ลิงค์สาธารณะ</translation> </message> @@ -5112,12 +5167,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>การเข้ารหัสชื่อไฟล์ไม่ถูกต้อง</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>ไม่สามารถอ่านจากบันทึกการประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>ไม่สามารถเปิดการผสานข้อมูลเจอร์นัล</translation> </message> @@ -5132,17 +5187,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>มีชื่อแฟ้มอย่างน้อยหนึ่งตัวอักษรที่ไม่ถูกต้อง</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>พื้นที่จัดเก็บเหลือน้อย: การดาวน์โหลดจะช่วยลดพื้นที่ว่างด้านล่าง %1 ที่ถูกข้ามไป</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>มีพื้นที่ว่างไม่เพียงพอบนเซิร์ฟเวอร์สำหรับการอัพโหลดบางรายการ</translation> </message> @@ -5405,66 +5460,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6130,7 +6185,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6146,12 +6201,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index a3bc61f39..fac11ccca 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>Diğer işlemleri görüntüle</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>Yok say</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>Paylaşma penceresini aç</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation>%1 dosyası zaten %2 tarafından kilitlenmiş.</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation>%1 kilitleme işlemi %2 hatası nedeniyle yapılamadı</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation>%1 kilit açma işlemi %2 hatası nedeniyle yapılamadı</translation> </message> @@ -752,47 +752,47 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</transl <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Oturum kapatıldı</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Bağlantı kesildi</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>Bağlantı kuruldu</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Hizmet kullanılamıyor</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Bakım kipi</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Ağ sorunu</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Yapılandırma sorunu</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Kimlik doğrulama bilgileri soruluyor</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Hesap durumu bilinmiyor</translation> </message> @@ -800,17 +800,17 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</transl <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Diğer işlemler için lütfen İşlemler uygulamasını açın.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation>İşlemler alınıyor…</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>Yok sayma listesindeki dosyalar ve sembolik bağlantılar eşitlenmez.</translation> </message> @@ -1588,7 +1588,7 @@ Sunucuda bu eşitleme işlemlerinin yapılmasını istediğinizden emin misiniz? Bu işlemi yanlışlıkla yaptıysanız ve dosyalarınızı korumak istiyorsanız dosyalar sunucudan yeniden eşitlenecek.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1599,7 +1599,7 @@ Geri yükleme yetkiniz varsa ve geri yüklemeyi seçerseniz, dosyalar sunucu ile Silmeyi seçerseniz, sahibi değilseniz bu dosyaları artık kullanamazsınız.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1609,17 +1609,17 @@ Sunucuda bu eşitleme işlemlerinin yapılmasını istediğinizden emin misiniz? Bu işlemi yanlışlıkla yaptıysanız ve dosyalarınızı korumak istiyorsanız dosyalar sunucudan yeniden eşitlenecek.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Tüm dosyalar silinsin mi?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Tüm dosyalar silinsin</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Dosyalar korunsun</translation> </message> @@ -2502,7 +2502,7 @@ Silme izni verildiğinde bir klasörün silinmesini engelleyen ögeler silinir. <translation>Yeni dosya adı</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>Dosyayı yeniden adlandır</translation> </message> @@ -2513,29 +2513,74 @@ Silme izni verildiğinde bir klasörün silinmesini engelleyen ögeler silinir. </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>Sistemde dosya adlarında kullanılmasına izin verilmeyen karakterler: * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>Bu dosyayı yeniden adlandırma izniniz yok. Dosya sahibinden dosyanın adını değiştirmesini isteyebilirsiniz.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>Dosya adında izin verilmeyen karakterler var: %1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>Dosya yeniden adlandırılamadı. Sunucuya bağlı olduğunuzdan emin olun.</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>Aynı adlı bir dosya sunucu üzerinde zaten var olduğundan dosya yeniden adlandırılamadı. Lütfen başka bir ad seçin.</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3486,27 +3531,17 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>Dosya adının sonunda boşluklar bulunuyor ve sunucuda aynı ada sahip bir dosya zaten var olduğundan yeniden adlandırılamadı.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>Dosya adının sonunda boşluklar bulunuyor ve yerel olarak aynı ada sahip bir dosya zaten var olduğundan yeniden adlandırılamadı.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>Sembolik bağlantıların eşitlenmesi desteklenmiyor.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>Dosya yok sayılanlar listesinde.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Nokta ile biten dosya adları bu dosya sisteminde desteklenmiyor.</translation> </message> @@ -3516,62 +3551,72 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>'%1' karakterini içeren dosya adları bu sistemde desteklenmiyor.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>"%1" karakterini içeren dosya adları bu sistemde desteklenmiyor.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>Dosya adında en az bir geçersiz karakter var</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>Bu dosya adı bu dosya sisteminde ayırtılmış bir ad olduğundan kullanılamaz.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>Dosya adının sonunda boşluklar var.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>Dosya adı çok uzun.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Dosya/klasör gizli olduğu için yok sayıldı.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>Durum alınamadı.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Çakışma: Sunucu sürümü indirildi, yerel kopya yeniden adlandırıldı ve yüklenmedi.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>Dosya adı dosya sisteminizde kodlanamıyor.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>Dosya adı sunucu üzerinde kara listeye alınmış.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>Dosyanın uzantısı sanal dosyalar için ayrılmış.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>boyut</translation> </message> @@ -3581,27 +3626,37 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>izinler</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>sunucu numarası %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>izin</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>dosya kodu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>Dosya adının sonunda boşluklar bulunuyor ve sunucuda aynı ada sahip bir dosya zaten var olduğundan yeniden adlandırılamadı.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>Dosya adının sonunda boşluklar bulunuyor ve yerel olarak aynı ada sahip bir dosya zaten var olduğundan yeniden adlandırılamadı.</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>sunucu numarası %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>Sunucunun bildirilen numarası %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation>Değiştirilme zamanı geçersiz olduğundan eşitlenemedi</translation> </message> @@ -3611,47 +3666,47 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Bazı dosyalar bir klasöre yüklenirken çalışma oldu. Çakışmalar temizlenecek!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Bir klasör yüklenirken çakışma oldu. Çakışma temizlenecek!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Bir dosya yüklenirken çakışma oldu. Çakışma temizlenecek!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>"Eşitlenecek ögeleri seçin" kara listesinde olduğundan yok sayıldı</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Bu klasöre alt klasör ekleme izniniz olmadığından izin verilmedi</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Bu klasöre dosya ekleme izniniz olmadığından izin verilmedi</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Sunucu üzerinde salt okunur olduğundan, bu dosya yüklenemedi, geri yükleniyor</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>Geçersiz bir hedefe taşındı, geri yükleniyor</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>Silmeye izin verilmedi, geri yükleniyor</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>Veritabanı okunurken sorun çıktı</translation> </message> @@ -3661,7 +3716,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>!%1' klasörü okunurken sunucu bir hata yanıtı verdi: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>"%1" klasörü okunurken sunucu bir hata yanıtı verdi: %2</translation> </message> @@ -4115,7 +4170,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Eşitlenecek ögeleri seçin</translation> </message> @@ -4143,13 +4198,13 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Boyut</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>Sunucuda şu anda bir alt klasör yok.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Alt klasör listesi alınırken bir sorun çıktı.</translation> </message> @@ -4157,12 +4212,12 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation>Yanıtla</translation> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Yok say</translation> </message> @@ -4209,11 +4264,6 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>ownCloud Yolu:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Simge</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>paylaşma etiketi</translation> @@ -4224,6 +4274,11 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Nextcloud Yolu:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Simge</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4403,27 +4458,27 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Paylaşım bağlantısını sil</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Bağlantı paylaşımını silmeyi onayla</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Gerçekten <i>%1</i> herkese açık bağlantısını silmek istiyor musunuz?</p><p><b>Not:</b> Bu işlem geri alınamaz.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Sil</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>İptal</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Herkese açık bağlantı</translation> </message> @@ -5152,12 +5207,12 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Dosya adı kodlaması geçersiz</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Eşitleme günlüğü okunamadı.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Eşitleme günlüğü açılamadı</translation> </message> @@ -5172,17 +5227,17 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Dosya adında en az bir geçersiz karakter var</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>Eşitleme kısa bir süre sonra sürdürülecek</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Disk alanı azaldı: Boş alanı %1 değerinin altına düşürecek indirmeler atlandı.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Sunucu üzerinde bazı yüklemeleri kaydetmek için yeterli alan yok.</translation> </message> @@ -5445,66 +5500,66 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Kullanıcı durumu iletisi kaldırılamadı. Sunucuya bağlı olduğunuzdan emin olun.</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>Kaldırılmasın</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 dakika</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 saat</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 saat</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>Bugün</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>Bu hafta</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>1 dakikadan az</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 dakika</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 dakika</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 saat</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 gün</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 gün</translation> </message> @@ -6170,7 +6225,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Çevrimiçi</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>Okunmuş olarak işaretle</translation> </message> @@ -6186,12 +6241,12 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation>Şuraya yanıtla…</translation> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation>Bir görüşme iletisini yanıtla</translation> </message> diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 434168942..d7740d01b 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation type="unfinished"/> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation type="unfinished"/> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -748,47 +748,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>Вийшов</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>Від'єднаний</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>З'єднаний</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>Сервіс недоступний</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>Режим обслуговування</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>Помилка мережі</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>Помилка конфігурації</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>Запит на повноваження доступу</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>Невідомий стан облікового запису</translation> </message> @@ -796,17 +796,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>Для докладного перегляду змін, будь ласка, відкрийте застосунок Події.</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation type="unfinished"/> </message> @@ -1566,7 +1566,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1574,24 +1574,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>Видалити усі файли?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>Видалити усі файли</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>Зберегти файли</translation> </message> @@ -2470,7 +2470,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation type="unfinished"/> </message> @@ -2481,29 +2481,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3442,27 +3487,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> @@ -3472,62 +3507,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation type="unfinished"/> </message> @@ -3537,27 +3582,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="490"/> + <source>permission</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> - <source>permission</source> + <location filename="../src/libsync/discovery.cpp" line="494"/> + <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> - <source>file id</source> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3567,47 +3622,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3617,7 +3672,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -4071,7 +4126,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>Оберіть, що хочете синхронізувати</translation> </message> @@ -4099,13 +4154,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Розмір</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>На сервері зараз немає підтек.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Помилка під час завантаження списку підтек.</translation> </message> @@ -4113,12 +4168,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>Припинити</translation> </message> @@ -4165,11 +4220,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Шлях до ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>Значок</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>поділитися міткою</translation> @@ -4180,6 +4230,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Шлях до Nextcloud:</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>Значок</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4359,27 +4414,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Вилучити посилання для спільного використання</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>Підтвердіть вилучення спільного ресурсу з посиланням</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Дійсно вилучити спільний ресурс із публічним посиланням <i>%1</i>?</p><p>Примітка: цю дію неможливо буде повернути.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>Вилучити</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>Скасувати</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>Публічне посилання</translation> </message> @@ -5108,12 +5163,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Кодування файлу не припустиме</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>Неможливо прочитати з журналу синхронізації.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>Не вдається відкрити протокол синхронізації</translation> </message> @@ -5128,17 +5183,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ім’я файлу містить принаймні один некоректний символ</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Закінчується місце на диску. Звантаження, які можуть зменшити вільне місце до 1% буде пропущено.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Недостатньо місця на сервері для окремих завантажень.</translation> </message> @@ -5401,66 +5456,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation type="unfinished"/> </message> @@ -6126,7 +6181,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation type="unfinished"/> </message> @@ -6142,12 +6197,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index cdb1faa8a..a8edf87d9 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>显示更多操作</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>忽略</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>打开共享对话框</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation type="unfinished"/> </message> @@ -748,47 +748,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>已退出</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>连接已断开</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>已连接</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>服务不可用</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>维护模式</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>网络错误</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>配置错误</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>凭证</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>未知的账号状态</translation> </message> @@ -796,17 +796,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>有关更多动态，请打开 “动态” 应用。</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>来自忽略列表的文件和符号链接不会被同步。</translation> </message> @@ -1580,7 +1580,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>本地同步文件夹“%1”中的所有文件已被删除。这些删除将与您的服务器同步，使这些文件不可用，除非恢复。您确定要与服务器同步这些操作吗?如果这是一个意外，您决定保留您的文件，它们将从服务器重新同步。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1591,7 +1591,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a 如果您决定删除文件，它们将对您不可用，除非您是所有者。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1600,17 +1600,17 @@ If this was an accident and you decide to keep your files, they will be re-synce 如果这是一次意外，而您决定保留您的文件，它们将从服务器重新同步。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>移除所有文件？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>移除所有文件</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>保留文件</translation> </message> @@ -2493,7 +2493,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>新文件名</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>重命名文件</translation> </message> @@ -2504,29 +2504,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>此系统不允许下列字符： * " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>您没有重命名此文件的权限。请文件的作者重新命名它。</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>文件名包含非法字符：%1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>无法重命名文件。请确保您已连接到服务器。</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>无法重命名文件，因为服务器上已经存在同名文件。请换一个名字。</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3468,27 +3513,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>文件名包含尾随空格，无法重命名，因为服务器上已经存在同名文件。</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>文件名包含尾随空格，无法重命名，因为本地已经存在同名文件。</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>符号链接在同步中不受支持。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>文件位于忽略列表中</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>此文件系统不支持以句点结尾的文件名。</translation> </message> @@ -3498,62 +3533,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>此文件系统不支持包含字符 '%1' 的文件名</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>此文件系统不支持包含字符“%1”的文件名</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>文件名包含至少一个无效字符</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>此文件名是这个文件系统上的保留名。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>文件名包含结尾空白</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>文件名太长</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>文件/文件夹被忽略，因为它是隐藏的。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>由于排除或错误，项目被跳过。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>冲突：服务器版本已下载，本地副本已重命名，但未上传。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>文件名无法在您的文件系统上被编码</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>该文件名在服务器上被列入黑名单</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>文件有为虚拟文件保留的扩展名</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>大小</translation> </message> @@ -3563,27 +3608,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>权限</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>服务器报告无 %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>权限</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>文件标识</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>文件名包含尾随空格，无法重命名，因为服务器上已经存在同名文件。</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>文件名包含尾随空格，无法重命名，因为本地已经存在同名文件。</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>服务器报告无 %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>服务器报告无 %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation type="unfinished"/> </message> @@ -3593,47 +3648,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>上传文件到文件夹时发生冲突。那些冲突的会被清除!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>上传文件夹时发生冲突。它会被清除!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>上传时发生冲突。它将被移除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>因“选择要同步的内容”黑名单而被忽略</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>不被允许，因为您没有向该文件夹添加子文件夹的权限。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>不被允许，因为您没有在该文件夹中添加文件的权限。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>不允许上传这个文件，因为它在这台服务器上是只读的，恢复中。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>移动到无效目标，恢复中。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>不允许移除，恢复中。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>读取数据库时出错</translation> </message> @@ -3643,7 +3698,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>服务器在读取目录 '%1' 时回复了一个错误：%2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>服务器在读取目录 "%1" 时返回了一个错误: %2 </translation> </message> @@ -4097,7 +4152,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>选择同步内容</translation> </message> @@ -4125,13 +4180,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>大小</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>这个服务器上暂不存在子文件夹。</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>载入子文件夹列表时发生错误。</translation> </message> @@ -4139,12 +4194,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>忽略</translation> </message> @@ -4191,11 +4246,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud 路径：</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>图标</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>共享标签</translation> @@ -4206,6 +4256,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nextcloud 路径：</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>图标</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4385,27 +4440,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>删除共享链接</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>确认删除共享链接</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation>您真的想删除公开共享链接 <i>%1</i>？<p><p>注意：此操作无法撤销。</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>删除</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>取消</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>公开链接</translation> </message> @@ -5134,12 +5189,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>文件名编码无效</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>无法读取同步日志。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>无法打开同步日志</translation> </message> @@ -5154,17 +5209,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>文件名中存在至少一个非法字符</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>同步将很快恢复。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>硬盘剩余容量过低：下载后将会导致剩余容量低于 %1 的文件将会被跳过。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>对于某些上传文件来说，服务器端的可用空间不足。</translation> </message> @@ -5427,66 +5482,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>无法清除用户状态信息。确保您已连接到服务器。</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>不要清除</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 分钟</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 小时</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 小时</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>今日</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>本周</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>不到一分钟</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 分钟</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 分钟</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 小时</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 天</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 天</translation> </message> @@ -6152,7 +6207,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>在线</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>标记为已读</translation> </message> @@ -6168,12 +6223,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation type="unfinished"/> </message> diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts index a891fbb3c..537f073a7 100644 --- a/translations/client_zh_HK.ts +++ b/translations/client_zh_HK.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>顯示更多操作</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>撤銷</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>開啟分享對話方塊</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation>檔案 %1 已被 %2 上鎖。</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation>%1 的上鎖操作失敗，錯誤為 %2</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation>%1 的解鎖操作失敗，錯誤為 %2</translation> </message> @@ -753,47 +753,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>已登出</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>已經離線</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>已連線</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>服務無法使用</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>維護模式</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>網絡異常</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>設定錯誤</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>正在詢問憑證</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>未知的帳號狀態</translation> </message> @@ -801,17 +801,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>請開啟活動以檢視更多活動app</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation>正在擷取活動紀錄 ...</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>略過清單中的檔案以及符號連結不會同步。</translation> </message> @@ -1588,7 +1588,7 @@ If this was an accident and you decide to keep your files, they will be re-synce 如果您意外刪除了檔案並決定保留它們，則它們將從伺服器重新同步。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1599,7 +1599,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a 假如您決定刪除這些檔案，除非您是檔案的所有者，否則您將無法讀取這些檔案。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1608,17 +1608,17 @@ If this was an accident and you decide to keep your files, they will be re-synce 如果您意外地刪除了檔案並決定保留它們，則它們將從伺服器重新同步。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>移除所有檔案？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>移除所有檔案</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>保留檔案</translation> </message> @@ -2501,7 +2501,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>新檔案名稱</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>重新命名檔案</translation> </message> @@ -2512,29 +2512,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>系統不允許使用以下字符：* " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>您無權重命名此檔案。 請要求檔案的擁有者重命名它。</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>檔案名含有非法字符：%1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>無法重命名檔案。 請確保您已連接到伺服器。</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>無法重命名檔案，因為伺服器上已存在同名檔案。 請選擇另一個名字。</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3485,27 +3530,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>檔案的名稱包含尾隨空格，無法重命名，因為服務器上已存同名稱的檔案。</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>檔案的名稱包含尾隨空格，無法重命名，因為近端上已存在相同名稱的檔案。</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>同步不支援符號連結</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>檔案被列在忽略清單。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>此檔案系統不支援以「。」結尾的檔案名。</translation> </message> @@ -3515,62 +3550,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>此檔案系統不支援含「%1」字元的檔案名稱。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>此檔案系統不支援含 "%1" 字元的檔案名稱。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>檔案名稱含有不合法的字元</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>此檔案名已被此檔案系統保留所用。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>檔案名的結尾為空白符。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>檔案名稱太長。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>檔案或資料夾被隱藏，因此跳過</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>狀態失敗。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>抵觸：已下載伺服器版本，近端版本已更名但並未上傳。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>您的檔案系統無法對此檔案名進行編碼。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>伺服器已將此檔名列為黑名單。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>檔案名包含為虛擬檔案保留的擴展名。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>大小</translation> </message> @@ -3580,27 +3625,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>權限</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>伺服器報告沒有 %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>權限</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>檔案 ID</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>檔案的名稱包含尾隨空格，無法重命名，因為服務器上已存同名稱的檔案。</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>檔案的名稱包含尾隨空格，無法重命名，因為近端上已存在相同名稱的檔案。</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>伺服器報告沒有 %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>伺服器報告沒有 %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation>由於修改時間無效，無法同步</translation> </message> @@ -3610,47 +3665,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>將某些檔案上傳到資料夾時發生衝突。那些有衝突的檔案將被清除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>上傳資料夾時發生衝突。將被清除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>上傳檔案時發生衝突。將被清除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>被忽略，因為它在“選擇要同步的內容”黑名單中</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>拒絕此操作，您沒有在此新增子資料夾的權限。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>拒絕此操作，您沒有新增檔案在此資料夾的權限。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>不允許上傳此檔案，因為它在伺服器上是唯讀的，正在還原</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>已移至無效目標，正在還原</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>不允許刪除，還原</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>讀取數據庫時發生錯誤。</translation> </message> @@ -3660,7 +3715,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>伺服器讀取目錄 '%1' 時發生錯誤：%2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>伺服器在讀取目錄「%1」回覆錯誤：%2</translation> </message> @@ -4114,7 +4169,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>選擇要同步的項目</translation> </message> @@ -4142,13 +4197,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>大小</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>目前沒有子資料夾在伺服器上。</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>列出子資料夾時出錯。</translation> </message> @@ -4156,12 +4211,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation>回覆</translation> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>撤銷</translation> </message> @@ -4208,11 +4263,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud 路徑：</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>圖示</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>分享標籤</translation> @@ -4223,6 +4273,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nextcloud 路徑：</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>圖示</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4402,27 +4457,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>刪除分享連結</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>確認移除連結分享</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>您確定要移除公共連結分享<i>%1</i>嗎？</p><p>注意：此操作不可復原。</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>刪除</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>取消</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>公共連結</translation> </message> @@ -5151,12 +5206,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>檔案名稱編碼是無效的</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>無法讀取同步日誌。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>同步處理日誌無法開啟</translation> </message> @@ -5171,17 +5226,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>檔案名稱含有不合法的字元</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>同步會很快恢復</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>剩餘空間不足：下載後將使剩餘空間降至低於%1的檔案一律跳過。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>伺服器上的剩餘空間不足以容納某些要上載的檔案。</translation> </message> @@ -5444,66 +5499,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>無法清除用戶訊息。 請確保您已連接到伺服器。</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>不要清除</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30 分鐘</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1 小時</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4 小時</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>今天</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>本星期</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>不到一分鐘</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1 分鐘</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1 分鐘</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1 小時</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1 日</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1 天</translation> </message> @@ -6169,7 +6224,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>在線</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>標為已讀</translation> </message> @@ -6185,12 +6240,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation>回覆到 ...</translation> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation>發送聊天回覆訊息</translation> </message> diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 49a23ec65..d915a39ef 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -36,8 +36,8 @@ <context> <name>ActivityItemActions</name> <message> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/> - <location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="84"/> + <location filename="../src/gui/tray/ActivityItemActions.qml" line="95"/> <source>Show more actions</source> <translation>顯示更多動作</translation> </message> @@ -45,13 +45,13 @@ <context> <name>ActivityItemContent</name> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="199"/> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="210"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="185"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="196"/> <source>Dismiss</source> <translation>忽略</translation> </message> <message> - <location filename="../src/gui/tray/ActivityItemContent.qml" line="241"/> + <location filename="../src/gui/tray/ActivityItemContent.qml" line="227"/> <source>Open share dialog</source> <translation>開啟分享對話方塊</translation> </message> @@ -329,17 +329,17 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="873"/> + <location filename="../src/libsync/account.cpp" line="876"/> <source>File %1 is already locked by %2.</source> <translation>檔案 %1 已被 %2 鎖定。</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="875"/> + <location filename="../src/libsync/account.cpp" line="878"/> <source>Lock operation on %1 failed with error %2</source> <translation>%1 的鎖定操作失敗，錯誤為 %2</translation> </message> <message> - <location filename="../src/libsync/account.cpp" line="877"/> + <location filename="../src/libsync/account.cpp" line="880"/> <source>Unlock operation on %1 failed with error %2</source> <translation>%1 的解除鎖定操作失敗，錯誤為 %2</translation> </message> @@ -752,47 +752,47 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="146"/> + <location filename="../src/gui/accountstate.cpp" line="149"/> <source>Signed out</source> <translation>已登出</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="148"/> + <location filename="../src/gui/accountstate.cpp" line="151"/> <source>Disconnected</source> <translation>已斷線</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="150"/> + <location filename="../src/gui/accountstate.cpp" line="153"/> <source>Connected</source> <translation>已連線</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="152"/> + <location filename="../src/gui/accountstate.cpp" line="155"/> <source>Service unavailable</source> <translation>服務無法使用</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="154"/> + <location filename="../src/gui/accountstate.cpp" line="157"/> <source>Maintenance mode</source> <translation>維護模式</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="156"/> + <location filename="../src/gui/accountstate.cpp" line="159"/> <source>Network error</source> <translation>網路錯誤</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="158"/> + <location filename="../src/gui/accountstate.cpp" line="161"/> <source>Configuration error</source> <translation>設定錯誤</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="160"/> + <location filename="../src/gui/accountstate.cpp" line="163"/> <source>Asking Credentials</source> <translation>正在詢問憑證</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="162"/> + <location filename="../src/gui/accountstate.cpp" line="165"/> <source>Unknown account state</source> <translation>未知的帳號狀態</translation> </message> @@ -800,17 +800,17 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="464"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="466"/> <source>For more activities please open the Activity app.</source> <translation>請開啟活動應用程式以檢視更多活動。</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="488"/> <source>Fetching activities…</source> <translation>正在擷取活動紀錄……</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="559"/> <source>Files from the ignore list as well as symbolic links are not synced.</source> <translation>忽略列表中的檔案與符號連結不會同步。</translation> </message> @@ -1589,7 +1589,7 @@ If this was an accident and you decide to keep your files, they will be re-synce 如果這是意外，而且您決定保留您的檔案，它們將會自伺服器重新同步。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1264"/> + <location filename="../src/gui/folder.cpp" line="1269"/> <source>All files in the sync folder "%1" folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -1600,7 +1600,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a 假如您決定移除這些檔案，除非您是檔案的所有者，否則您將無法讀取這些檔案。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1269"/> + <location filename="../src/gui/folder.cpp" line="1274"/> <source>All the files in your local sync folder "%1" were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -1609,17 +1609,17 @@ If this was an accident and you decide to keep your files, they will be re-synce 如果這是意外，而且您決定保留您的檔案，它們將會自伺服器重新同步。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1273"/> + <location filename="../src/gui/folder.cpp" line="1278"/> <source>Remove All Files?</source> <translation>移除所有檔案？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1277"/> + <location filename="../src/gui/folder.cpp" line="1282"/> <source>Remove all files</source> <translation>移除所有檔案</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1278"/> + <location filename="../src/gui/folder.cpp" line="1283"/> <source>Keep files</source> <translation>保留檔案</translation> </message> @@ -2502,7 +2502,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>新檔案名稱</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="86"/> <source>Rename file</source> <translation>重新命名檔案</translation> </message> @@ -2513,29 +2513,74 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> + <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> <translation>系統不允許以下字元：* " | & ? , ; : \ / ~ < ></translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="89"/> + <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="96"/> + <source>Checking rename permissions...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="126"/> <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source> <translation>您無權重新命名此檔案。請要求檔案的作者重新命名它。</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="131"/> + <source>Failed to fetch permissions with error %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="154"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="157"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="159"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="164"/> + <source>Use invalid name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="208"/> <source>Filename contains illegal characters: %1</source> <translation>檔案名稱包含了非法字元：%1</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="221"/> <source>Could not rename file. Please make sure you are connected to the server.</source> <translation>無法重新命名檔案。請確保您已連線至伺服器。</translation> </message> <message> - <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="232"/> <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source> <translation>無法重新命名檔案，因為伺服器上已有同名檔案。請換一個名字。</translation> </message> + <message> + <location filename="../src/gui/invalidfilenamedialog.cpp" line="268"/> + <source>Could not rename local file. %1</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::LegalNotice</name> @@ -3486,27 +3531,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="56"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> - <translation>檔案名稱尾端包含空格，且無法重新命名，因為伺服器上已有相同名稱的檔案存在。</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="59"/> - <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> - <translation>檔案名稱尾端包含空格，且無法重新命名，因為本機已有相同名稱的檔案存在。</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="297"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>Symbolic links are not supported in syncing.</source> <translation>同步不支援符號連結。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="305"/> + <location filename="../src/libsync/discovery.cpp" line="283"/> <source>File is listed on the ignore list.</source> <translation>檔案被列在忽略清單。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="309"/> + <location filename="../src/libsync/discovery.cpp" line="287"/> <source>File names ending with a period are not supported on this file system.</source> <translation>此檔案系統不支援以「.」結尾的檔案名。</translation> </message> @@ -3516,62 +3551,72 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>此檔案系統不支援包含「%1」字元的檔案名稱。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="319"/> + <location filename="../src/libsync/discovery.cpp" line="297"/> <source>File names containing the character "%1" are not supported on this file system.</source> <translation>此檔案系統不支援包含「%1」字元的檔案名稱。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="321"/> + <location filename="../src/libsync/discovery.cpp" line="299"/> <source>File name contains at least one invalid character</source> <translation>檔案名稱包含至少一個無效的字元</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="323"/> + <location filename="../src/libsync/discovery.cpp" line="301"/> <source>The file name is a reserved name on this file system.</source> <translation>此檔案名稱為檔案系統的保留名稱。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="329"/> + <location filename="../src/libsync/discovery.cpp" line="307"/> <source>Filename contains trailing spaces.</source> <translation>檔案名稱的結尾為空格。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="333"/> + <location filename="../src/libsync/discovery.cpp" line="311"/> + <source>Filename contains leading spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="315"/> + <source>Filename contains leading and trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="319"/> <source>Filename is too long.</source> <translation>檔案名稱太長。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="337"/> + <location filename="../src/libsync/discovery.cpp" line="323"/> <source>File/Folder is ignored because it's hidden.</source> <translation>因為檔案或資料夾被隱藏，因此被忽略。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="340"/> + <location filename="../src/libsync/discovery.cpp" line="326"/> <source>Stat failed.</source> <translation>統計失敗。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="343"/> + <location filename="../src/libsync/discovery.cpp" line="329"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>衝突：已下載伺服器的版本，本機版本已更名但並未上傳。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="347"/> + <location filename="../src/libsync/discovery.cpp" line="333"/> <source>The filename cannot be encoded on your file system.</source> <translation>您的檔案系統無法對此檔案名進行編碼。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="350"/> + <location filename="../src/libsync/discovery.cpp" line="336"/> <source>The filename is blacklisted on the server.</source> <translation>伺服器已將此檔名列為黑名單。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="419"/> + <location filename="../src/libsync/discovery.cpp" line="405"/> <source>File has extension reserved for virtual files.</source> <translation>檔案有為虛擬檔案保留的副檔名。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="502"/> + <location filename="../src/libsync/discovery.cpp" line="488"/> <source>size</source> <translation>大小</translation> </message> @@ -3581,27 +3626,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>權限</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>伺服器回報沒有 %1</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="504"/> + <location filename="../src/libsync/discovery.cpp" line="490"/> <source>permission</source> <translation>權限</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="508"/> + <location filename="../src/libsync/discovery.cpp" line="494"/> <source>file id</source> <translation>檔案 ID</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="512"/> + <location filename="../src/libsync/discovery.cpp" line="56"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists on the server.</source> + <translation>檔案名稱尾端包含空格，且無法重新命名，因為伺服器上已有相同名稱的檔案存在。</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="59"/> + <source>File contains trailing spaces and could not be renamed, because a file with the same name already exists locally.</source> + <translation>檔案名稱尾端包含空格，且無法重新命名，因為本機已有相同名稱的檔案存在。</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="456"/> + <source>server reported no %1</source> + <translation>伺服器回報沒有 %1</translation> + </message> + <message> + <location filename="../src/libsync/discovery.cpp" line="498"/> <source>Server reported no %1</source> <translation>伺服器回報沒有 %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="857"/> + <location filename="../src/libsync/discovery.cpp" line="843"/> <source>Cannot sync due to invalid modification time</source> <translation>由於修改時間無效，因此無法同步</translation> </message> @@ -3611,47 +3666,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>將某些檔案上傳到資料夾時發生錯誤。衝突的檔案將會被清除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1151"/> + <location filename="../src/libsync/discovery.cpp" line="1137"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>上傳資料夾時發生衝突。將會被清除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1154"/> + <location filename="../src/libsync/discovery.cpp" line="1140"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>上傳檔案時發生衝突。其將會被移除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1488"/> + <location filename="../src/libsync/discovery.cpp" line="1474"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>由於「選擇要同步的內容」黑名單而被忽略</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1521"/> + <location filename="../src/libsync/discovery.cpp" line="1507"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>不允許，因為您無權新增子資料夾到該資料夾</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1526"/> + <location filename="../src/libsync/discovery.cpp" line="1512"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>不允許，因為您無權新增檔案到該資料夾</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1539"/> + <location filename="../src/libsync/discovery.cpp" line="1525"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>不允許上傳此檔案，因為這在伺服器上是唯讀，正在復原</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1561"/> + <location filename="../src/libsync/discovery.cpp" line="1547"/> <source>Moved to invalid target, restoring</source> <translation>移動至無效目標，正在復原</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1575"/> + <location filename="../src/libsync/discovery.cpp" line="1561"/> <source>Not allowed to remove, restoring</source> <translation>不允許刪除，正在復原</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1713"/> + <location filename="../src/libsync/discovery.cpp" line="1699"/> <source>Error while reading the database</source> <translation>讀取資料庫時發生錯誤</translation> </message> @@ -3661,7 +3716,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>伺服器在讀取目錄「%1」回覆錯誤：%2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1774"/> + <location filename="../src/libsync/discovery.cpp" line="1760"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>伺服器在讀取目錄「%1」回覆錯誤：%2</translation> </message> @@ -4115,7 +4170,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="489"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="509"/> <source>Choose What to Sync</source> <translation>選擇要同步的項目</translation> </message> @@ -4143,13 +4198,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>大小</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="235"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="294"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="237"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="314"/> <source>No subfolders currently on the server.</source> <translation>目前沒有子資料夾在伺服器上。</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="296"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="316"/> <source>An error occurred while loading the list of sub folders.</source> <translation>列出子資料夾時出錯。</translation> </message> @@ -4157,12 +4212,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="131"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="121"/> <source>Reply</source> <translation>回覆</translation> </message> <message> - <location filename="../src/gui/tray/notificationhandler.cpp" line="163"/> + <location filename="../src/gui/tray/notificationhandler.cpp" line="153"/> <source>Dismiss</source> <translation>我已了解</translation> </message> @@ -4209,11 +4264,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud 路徑：</translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="75"/> - <source>Icon</source> - <translation>圖示</translation> - </message> - <message> <location filename="../src/gui/sharedialog.ui" line="94"/> <source>share label</source> <translation>分享標籤</translation> @@ -4224,6 +4274,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nextcloud 路徑：</translation> </message> <message> + <location filename="../src/gui/sharedialog.ui" line="75"/> + <source>Icon</source> + <translation>圖示</translation> + </message> + <message> <location filename="../src/gui/sharedialog.cpp" line="95"/> <source>%1</source> <translation>%1</translation> @@ -4403,27 +4458,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>刪除分享連結</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="503"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="506"/> <source>Confirm Link Share Deletion</source> <translation>確認移除連結分享</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="504"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="507"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>您確定要移除公開連結分享 <i>%1</i> 嗎？</p><p>注意：此動作無法復原。</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="510"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="513"/> <source>Delete</source> <translation>刪除</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="511"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="514"/> <source>Cancel</source> <translation>取消</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="532"/> <source>Public link</source> <translation>公開連結</translation> </message> @@ -5152,12 +5207,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>檔案名稱編碼無效</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> + <location filename="../src/libsync/syncengine.cpp" line="572"/> <source>Unable to read from the sync journal.</source> <translation>無法讀取同步日誌。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="654"/> + <location filename="../src/libsync/syncengine.cpp" line="655"/> <source>Cannot open the sync journal</source> <translation>無法開啟同步日誌</translation> </message> @@ -5172,17 +5227,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>檔案名稱包含至少一個無效的字元</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1067"/> <source>Synchronization will resume shortly.</source> <translation>同步會很快恢復</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1077"/> + <location filename="../src/libsync/syncengine.cpp" line="1084"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>剩餘空間不足：下載後將使剩餘空間降至低於 %1 的檔案一律跳過。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1084"/> + <location filename="../src/libsync/syncengine.cpp" line="1091"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>伺服器上的剩餘空間不足以容納某些要上傳的檔案。</translation> </message> @@ -5445,66 +5500,66 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>無法清除使用者狀態訊息。請確保您已連線至伺服器。</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="359"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="457"/> <source>Don't clear</source> <translation>不要清除</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="362"/> <source>30 minutes</source> <translation>30分鐘</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="365"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="417"/> <source>1 hour</source> <translation>1小時</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="368"/> <source>4 hours</source> <translation>4小時</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="371"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="446"/> <source>Today</source> <translation>今天</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> - <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="374"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="448"/> <source>This week</source> <translation>本週</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="406"/> <source>Less than a minute</source> <translation>不到一分鐘</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/> <source>1 minute</source> <translation>1分鐘</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="412"/> <source>%1 minutes</source> <translation>%1分鐘</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/> <source>%1 hours</source> <translation>%1小時</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="424"/> <source>1 day</source> <translation>1天</translation> </message> <message> - <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> + <location filename="../src/gui/userstatusselectormodel.cpp" line="426"/> <source>%1 days</source> <translation>%1天</translation> </message> @@ -6170,7 +6225,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>線上</translation> </message> <message> - <location filename="../src/gui/tray/activitylistmodel.cpp" line="802"/> + <location filename="../src/gui/tray/activitylistmodel.cpp" line="805"/> <source>Mark as read</source> <translation>標記為已讀</translation> </message> @@ -6186,12 +6241,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>TalkReplyTextField</name> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="32"/> <source>Reply to …</source> <translation>回覆至……</translation> </message> <message> - <location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/> + <location filename="../src/gui/tray/TalkReplyTextField.qml" line="68"/> <source>Send reply to chat message</source> <translation>傳送回覆至聊天訊息</translation> </message> |