diff options
| author | Nextcloud bot <bot@nextcloud.com> | 2021-11-18 12:08:38 +0300 |
|---|---|---|
| committer | Nextcloud bot <bot@nextcloud.com> | 2021-11-18 12:08:38 +0300 |
| commit | 898949d1bc574ff5e4f70882742ff4fe2bc7ff4a (patch) | |
| tree | 5391858888efb5fd836f7ba6dd0ea792320336b5 | |
| parent | ef8fe58245ccede5f30d66212fc7ae28d9e7f13f (diff) | |
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
56 files changed, 3885 insertions, 3323 deletions
diff --git a/translations/client_bg.ts b/translations/client_bg.ts index 6210f0cdf..e7b8c643d 100644 --- a/translations/client_bg.ts +++ b/translations/client_bg.ts @@ -1352,15 +1352,6 @@ This means that the synchronization client might not upload local changes immedi % 1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>Всички файлове във вашата локална папка за синхронизиране '% 1' бяха изтрити. Тези изтривания ще бъдат синхронизирани с вашия сървър, което прави тези файлове недостъпни, освен ако не бъдат възстановени. - Сигурни ли сте, че искате да синхронизирате тези действия със сървъра? -Ако това е инцидент и решите да запазите файловете си, те ще бъдат синхронизирани отново от сървъра.</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1052"/> <source>All files in the sync folder '%1' 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. @@ -1421,7 +1412,27 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Запазване на Локалните Файлове като Конфликтни</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>Всички файлове в папката за синхронизиране „%1“ бяха изтрити на сървъра. +Тези изтривания ще бъдат синхронизирани с вашата локална папка за синхронизиране, което прави тези файлове недостъпни, освен ако нямате право да ги възстановите. +Ако решите да възстановите файловете, те ще бъдат повторно синхронизирани със сървъра, ако имате права за това. +Ако решите да изтриете файловете, те ще бъдат недостъпни за вас, освен ако не сте собственикът.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>Всички файлове във вашата локална папка за синхронизиране '% 1' бяха изтрити. Тези изтривания ще бъдат синхронизирани с вашия сървър, което прави тези файлове недостъпни, освен ако не бъдат възстановени. + Сигурни ли сте, че искате да синхронизирате тези действия със сървъра? +Ако това е инцидент и решите да запазите файловете си, те ще бъдат синхронизирани отново от сървъра.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1255"/> <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. @@ -1432,7 +1443,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1451,17 +1462,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Премахване на всички файлове</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>Всички файлове в папката за синхронизиране „%1“ бяха изтрити на сървъра. -Тези изтривания ще бъдат синхронизирани с вашата локална папка за синхронизиране, което прави тези файлове недостъпни, освен ако нямате право да ги възстановите. -Ако решите да възстановите файловете, те ще бъдат повторно синхронизирани със сървъра, ако имате права за това. -Ако решите да изтриете файловете, те ще бъдат недостъпни за вас, освен ако не сте собственикът.</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>Запазване на файловете</translation> @@ -1508,7 +1508,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Намерен е стар дневник за синхронизиране '% 1', но не може да бъде премахнат. Моля да се уверите, че в момента не го използва нито едно приложение.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Намерен е стар дневник за синхронизиране „%1“, но не може да бъде премахнат. Моля да се уверите, че в момента не го използва нито едно приложение.</translation> </message> @@ -2869,12 +2869,12 @@ for additional privileges during the process.</source> <translation>Виртуалните файлове не се поддържат за основни дялове на Windows като локална папка. Моля, изберете валидна подпапка под буквата на устройството.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>%1 папка „%2“ е синхронизирана с локалната папка „%3“</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>Синхронизиране на папка „%1“</translation> </message> @@ -3372,14 +3372,24 @@ 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="490"/> + <source>permission</source> + <translation>право</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>идентификатор на файла</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>сървърът е отчел не % 1</translation> + <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="946"/> @@ -4186,7 +4196,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Няма резултат за '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>Няма резултати за „%1“</translation> </message> @@ -4801,16 +4811,16 @@ 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="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Не може да се отвори или създаде локална база данни за синхронизиране. Уверете се, че имате достъп за запис в папката за синхронизиране.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Имената на файлове, съдържащи символа '% 1', не се поддържат от тази файлова система.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Не може да се отвори или създаде локална база данни за синхронизиране. Уверете се, че имате достъп за запис в папката за синхронизиране.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>Името на файла е запазено име на тази файлова система.</translation> @@ -4861,16 +4871,16 @@ 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="560"/> - <source>Unable to read from the sync journal.</source> - <translation>Не може да се чете от дневника за синхронизиране.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="571"/> <source>Filename encoding is not valid</source> <translation>Кодирането на име на файл е невалидно</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> + <translation>Не може да се чете от дневника за синхронизиране.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="643"/> <source>Cannot open the sync journal</source> <translation>Не може да се отвори дневника за синхронизиране.</translation> @@ -4881,16 +4891,16 @@ 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="1036"/> - <source>Synchronization will resume shortly.</source> - <translation>Синхронизацията ще се възобнови скоро.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>Името на файла съдържа поне един невалиден знак</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation>Синхронизацията ще се възобнови скоро.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Дисковото пространство е малко: Пропуснати са изтегляния, които биха намалили свободното място под% 1.</translation> @@ -5830,7 +5840,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation>Търсене на файлове, съобщения, събития...</translation> </message> @@ -5873,23 +5883,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Профилът е свързан</translation> + <source>Current user status is online</source> + <translation>Текущият потребителски статус е на линия</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Профилът не е свързан</translation> + <source>Current user status is do not disturb</source> + <translation>Текущият потребителски статус е не безпокойте</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Текущият потребителски статус е на линия</translation> + <source>Account connected</source> + <translation>Профилът е свързан</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Текущият потребителски статус е не безпокойте</translation> + <source>Account not connected</source> + <translation>Профилът не е свързан</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5902,7 +5912,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Задаване на състояние</translation> </message> @@ -6093,7 +6103,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Задаване на потребителско състояние</translation> </message> @@ -6193,7 +6203,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation>Обединен списък с резултати от търсенето</translation> </message> @@ -6204,7 +6214,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation>%1 - Файлова активност</translation> </message> diff --git a/translations/client_br.ts b/translations/client_br.ts index 5c00ddc86..366771fd5 100644 --- a/translations/client_br.ts +++ b/translations/client_br.ts @@ -1345,13 +1345,6 @@ Talvout a ra ar c'hliant kemprenn a c'hell n'omp pas pellkas ar c %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1412,7 +1405,22 @@ Kendec'hel ar kemprenadenn evel boaz a adskrivao pep restr gant ur stumm ko <translation>Gouarn ar Restroù Diabarzh evel Stourm</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1420,7 +1428,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1437,14 +1445,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1491,7 +1491,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Ar gazetenn kemprenn kozh '%1' a zo bet kavet, mes n'eo ket bet posupl lemel anezhañ. Grit sur n'eo implijet gant meziant ebet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2847,12 +2847,12 @@ evit aotreoù ouzhpenn e pad an oberenn.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3343,13 +3343,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4157,7 +4167,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Disoc'h ebet evit '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4772,16 +4782,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>An anv restr a achu gant ur prantad n'int ket douget ar sistem restr.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Dibosupl digeriñ pe krouiñ ar rouadenn-diaz kemprennet diabarzh. Bezit sur ho peus an aotre embann en teuliad kemprenn.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>An anv restr gant an arouez '%1' n'int ket douget gant ar sistem trestr-mañ.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Dibosupl digeriñ pe krouiñ ar rouadenn-diaz kemprennet diabarzh. Bezit sur ho peus an aotre embann en teuliad kemprenn.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>An anv restr a zo un anv restr miret ar sistem restr.</translation> @@ -4832,16 +4842,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>C'hwitet ar kregiñ.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>N'eo ket mat sifradur an anv restr</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Dibosupl eo digeriñ ar gazetenn kemprenn</translation> @@ -4852,16 +4862,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Arouez fall, andanvit "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>Un arouez fall ez eus d'an neubeutañ en anv restr</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5801,7 +5811,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5844,22 +5854,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Kont kenstaged</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Kont kenstaged</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5873,7 +5883,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Lemel ar c'hont</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6064,7 +6074,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ehanañ pep kemprennadenn</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6164,7 +6174,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Digeriñ an diviz rannañ</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6175,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_ca.ts b/translations/client_ca.ts index 88dc6557b..740c8ca3c 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -1342,15 +1342,6 @@ This means that the synchronization client might not upload local changes immedi <translation>No s'ha pogut fer un seguiment fiable dels canvis en les carpetes sincronitzades. Això significa que és possible que el client de sincronització no pugui carregar els canvis locals immediatament i, en canvi, només cercarà els canvis locals i els pujarà ocasionalment (per defecte, cada dues hores). %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>S'han suprimit tots els fitxers de la carpeta de sincronització local «%1». Aquestes supressions se sincronitzaran amb el servidor, per la qual cosa els fitxers deixaran d'estar disponibles si no els restaureu. -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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1403,7 +1394,27 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Mantén els fitxers locals com a conflicte</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>S'han suprimit tots els fitxers de la carpeta de sincronització «%1» del servidor. +Aquestes supressions se sincronitzaran a la vostra carpeta de sincronització local i aquests fitxers deixaran d'estar disponibles si no teniu dret a restaurar-los. +Si decidiu restaurar els fitxers, es tornaran a sincronitzar amb el servidor si teniu drets per a fer-ho. +Si decidiu suprimir els fitxers, deixaran d'estar disponibles, tret que en sigueu el propietari.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>S'han suprimit tots els fitxers de la carpeta de sincronització local «%1». Aquestes supressions se sincronitzaran amb el servidor, per la qual cosa els fitxers deixaran d'estar disponibles si no els restaureu. +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="1255"/> <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. @@ -1411,7 +1422,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1428,17 +1439,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Suprimeix tots els fitxers</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>S'han suprimit tots els fitxers de la carpeta de sincronització «%1» del servidor. -Aquestes supressions se sincronitzaran a la vostra carpeta de sincronització local i aquests fitxers deixaran d'estar disponibles si no teniu dret a restaurar-los. -Si decidiu restaurar els fitxers, es tornaran a sincronitzar amb el servidor si teniu drets per a fer-ho. -Si decidiu suprimir els fitxers, deixaran d'estar disponibles, tret que en sigueu el propietari.</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>Mantén els fitxers</translation> @@ -1485,7 +1485,7 @@ Si decidiu suprimir els fitxers, deixaran d'estar disponibles, tret que en <translation>S'ha trobat un diari de sincronització antic «%1», però no s'ha pogut suprimir. Assegureu-vos que no hi hagi cap aplicació que l'estigui utilitzant.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2836,12 +2836,12 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3332,13 +3332,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>id de fitxer</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4146,7 +4156,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>No hi ha resultats per a «%1»</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4761,16 +4771,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>No s'admeten els noms de fitxer que finalitzen amb un punt en aquest sistema de fitxers.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>No es pot obrir o crear la base de dades de sincronització local. Assegureu-vos que teniu accés d'escriptura a la carpeta de sincronització.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <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/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>No es pot obrir o crear la base de dades de sincronització local. Assegureu-vos que teniu accés d'escriptura a la carpeta de sincronització.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <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> @@ -4821,16 +4831,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>S'ha produït un error en comprovar l'estat.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>La codificació del nom de fitxer no és vàlida.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>No es pot obrir el diari de sincronització</translation> @@ -4841,16 +4851,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Caràcters no vàlids; canvieu el nom de «%1».</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <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/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5790,7 +5800,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5833,23 +5843,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Compte connectat</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Compte no connectat</translation> + <source>Current user status is do not disturb</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Compte connectat</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation type="unfinished"/> + <source>Account not connected</source> + <translation>Compte no connectat</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5862,7 +5872,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Suprimeix el compte</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6053,7 +6063,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Atura la sincronització de tot</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6153,7 +6163,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Obre el quadre de diàleg de compartició</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6164,7 +6174,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Mostra més accions</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_cs.ts b/translations/client_cs.ts index f3afa4dd0..3914069a0 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -1351,15 +1351,6 @@ To znamená, že se může stávat, že synchronizační klient nebude místní %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>Všechny soubory v místní synchronizované složce „%1“ byly smazány. Tyto soubory budou smazány i v synchronizované složce na serveru a nebudou tedy dostupné, dokud nebudou obnovené. -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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1419,7 +1410,27 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st <translation>Ponechat místní soubory jako konflikt</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>Všechny soubory v synchronizované složce „%1“ byly na serveru smazány. +Tyto soubory budou smazány i ve vaší místní synchronizované složce a nebudou tedy dostupné, pokud nemáte právo obnovovat. +Pokud se rozhodnete soubory ponechat, budou opět synchronizovány se serverem, pokud k tomu máte práva. +Pokud se rozhodnete soubory smazat, budou vám nedostupné, pokud nejste jejich vlastníkem.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>Všechny soubory v místní synchronizované složce „%1“ byly smazány. Tyto soubory budou smazány i v synchronizované složce na serveru a nebudou tedy dostupné, dokud nebudou obnovené. +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="1255"/> <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. @@ -1430,7 +1441,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1449,17 +1460,6 @@ Pokud to byla pouze chyba a chcete si tyto soubory ponechat, budou ze serveru zn <translation>Odebrat veškeré soubory</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>Všechny soubory v synchronizované složce „%1“ byly na serveru smazány. -Tyto soubory budou smazány i ve vaší místní synchronizované složce a nebudou tedy dostupné, pokud nemáte právo obnovovat. -Pokud se rozhodnete soubory ponechat, budou opět synchronizovány se serverem, pokud k tomu máte práva. -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"/> <source>Keep files</source> <translation>Ponechat soubory</translation> @@ -1506,7 +1506,7 @@ Pokud se rozhodnete soubory smazat, budou vám nedostupné, pokud nejste jejich <translation>Byl nalezen starý záznam synchronizace „%1“, ale nebylo možné ho odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Byl nalezen starý záznam synchronizace „%1“, ale nebylo možné ho odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation> </message> @@ -2867,12 +2867,12 @@ můžete být požádáni o dodatečná oprávnění.</translation> <translation>Ve Windows kořenovém adresáři oddílu disku nejsou virtuální soubory podporovány. Vyberte platný adresář v disku.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>%1 složka „%2“ je synchronizována do místní složky „%3“</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>Synchronizovat složku „%1“</translation> </message> @@ -3370,14 +3370,24 @@ 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="490"/> + <source>permission</source> + <translation>oprávnění</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>identif. souboru</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>server nahlásil žádné %1</translation> + <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="946"/> @@ -4184,7 +4194,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Žádné výsledky pro „%1“</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>Žádné výsledky pro „%1“</translation> </message> @@ -4799,16 +4809,16 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Názvy souborů končících tečkou nejsou na tomto souborovém systému podporovány.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Nedaří se otevřít nebo vytvořit místní synchronizační databázi. Ověřte, že máte přístup k zápisu do synchronizační složky.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <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/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Nedaří se otevřít nebo vytvořit místní synchronizační databázi. Ověřte, že máte přístup k zápisu do synchronizační složky.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <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> @@ -4859,16 +4869,16 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Zjištění existence (stat) se nezdařilo.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Kódování znaků v názvu souboru není platné</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Nedaří se otevřít synchronizační žurnál</translation> @@ -4879,16 +4889,16 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Neplatné znaky, přejmenujte „%1“</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <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="1110"/> <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/syncengine.cpp" line="1056"/> + <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="1045"/> <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> @@ -5828,7 +5838,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation>Hledat soubory, zprávy, události</translation> </message> @@ -5871,23 +5881,23 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Účet připojen</translation> + <source>Current user status is online</source> + <translation>Stávající stav uživatele je online</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Účet nepřipojen</translation> + <source>Current user status is do not disturb</source> + <translation>Stávající stav uživatele je nerušit</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Stávající stav uživatele je online</translation> + <source>Account connected</source> + <translation>Účet připojen</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Stávající stav uživatele je nerušit</translation> + <source>Account not connected</source> + <translation>Účet nepřipojen</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5900,7 +5910,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Odebrat účet</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Nastavit stav</translation> </message> @@ -6091,7 +6101,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Pozastavit synchronizaci u všeho</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Nastavit stav uživatele</translation> </message> @@ -6191,7 +6201,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Otevřít dialog sdílení</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation>Seznam výsledků sjednoceného vyhledávání</translation> </message> @@ -6202,7 +6212,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Zobrazit další akce</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation>%1 – aktivita ohledně souboru</translation> </message> @@ -6435,7 +6445,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <message> <location filename="../src/gui/guiutility.cpp" line="105"/> <source>Free up local space</source> - <translation>Uvolnit prostor</translation> + <translation>Uvolnit lokální prostor</translation> </message> </context> <context> diff --git a/translations/client_da.ts b/translations/client_da.ts index b1f43857a..9ad39a183 100644 --- a/translations/client_da.ts +++ b/translations/client_da.ts @@ -1350,13 +1350,6 @@ Dette betyder at synkroniseringsklienten muligvis ikke sender lokale ændringer %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1416,7 +1409,22 @@ Fortsætter sync som normalt, vil alle dine filer blive overskrevne med en ældr <translation>Behold Lokale Filer der Konflikter</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1424,7 +1432,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1441,14 +1449,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1495,7 +1495,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>En gammel sync journal '%1' fundet, men kunne ikke fjernes. Kontroller venligst at intet program benytter den.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2850,12 +2850,12 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3347,13 +3347,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4161,7 +4171,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ingen resultater for '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4776,16 +4786,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Filnavne der ender med punktum er ikke understøttet på dette filsystem.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Ikke i stand til at oprette en lokal sync database. Verificer at du har skriveadgang til sync mappen.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Filnavne der indeholder karakteren '%1' er ikke understøttet på dette filsystem.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Ikke i stand til at oprette en lokal sync database. Verificer at du har skriveadgang til sync mappen.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>Filnavnet er et reserveret navn på dette filsystem.</translation> @@ -4836,16 +4846,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Status fejlet.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Kodning af filnavn ikke gyldig</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Kunne ikke åbne synkroniserings loggen</translation> @@ -4856,16 +4866,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ugyldige karakterer, omdøb venligst "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>Filnavnet indeholder mindst ét ugyldigt tegn</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5805,7 +5815,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5848,23 +5858,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Kontoen er tilknyttet</translation> + <source>Current user status is online</source> + <translation>Nuværende brugerstatus er online</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Kontoen er ikke tilknyttet</translation> + <source>Current user status is do not disturb</source> + <translation>Nuværende brugerstatus er forstyr ikke</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Nuværende brugerstatus er online</translation> + <source>Account connected</source> + <translation>Kontoen er tilknyttet</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Nuværende brugerstatus er forstyr ikke</translation> + <source>Account not connected</source> + <translation>Kontoen er ikke tilknyttet</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5877,7 +5887,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Fjern konto</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6068,7 +6078,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Sæt alle synk. på pause</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6168,7 +6178,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Åbn delingsdialog</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6179,7 +6189,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Vis flere handlinger</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_de.ts b/translations/client_de.ts index 9b19dc714..16bd2b1c8 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -1352,15 +1352,6 @@ Dies bedeutet, dass der Synchronisierungs-Client lokale Änderungen möglicherwe %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>Alle Dateien im lokalen Synchronisierungs-Ordner '%1' wurden gelöscht. Diese Löschung wird mit Ihrem Server synchronisiert, wodurch die Dateien nicht mehr verfügbar sind, es sei denn, diese werden wiederhergestellt. -Sind Sie sich sicher, dass Sie diese Aktion mit Ihrem Server synchronisieren möchten? -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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1420,7 +1411,27 @@ Wenn diese Synchronisierung fortgesetzt wird, werden Dateien eventuell von älte <translation>Lokale Dateien als Konflikt behalten</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>Alle Dateien im Sync-Ordner '%1' wurden auf dem Server gelöscht. +Diese Löschungen werden mit Ihrem lokalen Sync-Ordner synchronisiert, wodurch diese Dateien nicht verfügbar sind, es sei denn, Sie haben das Recht, sie wiederherzustellen. +Wenn Sie sich entscheiden, die Dateien wiederherzustellen, werden sie erneut mit dem Server synchronisiert, wenn Sie das Recht dazu haben. +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="1260"/> + <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>Alle Dateien im lokalen Synchronisierungs-Ordner '%1' wurden gelöscht. Diese Löschung wird mit Ihrem Server synchronisiert, wodurch die Dateien nicht mehr verfügbar sind, es sei denn, diese werden wiederhergestellt. +Sind Sie sich sicher, dass Sie diese Aktion mit Ihrem Server synchronisieren möchten? +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="1255"/> <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. @@ -1431,7 +1442,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1450,17 +1461,6 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <translation>Alle Dateien entfernen</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>Alle Dateien im Sync-Ordner '%1' wurden auf dem Server gelöscht. -Diese Löschungen werden mit Ihrem lokalen Sync-Ordner synchronisiert, wodurch diese Dateien nicht verfügbar sind, es sei denn, Sie haben das Recht, sie wiederherzustellen. -Wenn Sie sich entscheiden, die Dateien wiederherzustellen, werden sie erneut mit dem Server synchronisiert, wenn Sie das Recht dazu haben. -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"/> <source>Keep files</source> <translation>Dateien behalten</translation> @@ -1507,7 +1507,7 @@ Wenn Sie sich entscheiden, die Dateien zu löschen, sind sie für Sie nicht mehr <translation>Ein altes Synchronisierungsprotokoll '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Ein altes Synchronisierungsprotokoll "%1" wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation> </message> @@ -2867,12 +2867,12 @@ for additional privileges during the process.</source> <translation>Virtuelle Dateien werden für die Wurzel von Windows-Partitionen als lokaler Ordner nicht unterstützt. Bitte wählen Sie einen gültigen Unterordner unter dem Laufwerksbuchstaben.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>%1 Ordner "%2" wird mit dem lokalen Ordner "%3" synchronisiert</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>Ordner "%1" synchronisieren</translation> </message> @@ -3370,14 +3370,24 @@ 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="490"/> + <source>permission</source> + <translation>Berechtigung</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>Datei-ID</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>Server meldet kein %1</translation> + <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="946"/> @@ -4184,7 +4194,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Keine Ergebnisse für '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>Keine Ergebnisse für "%1"</translation> </message> @@ -4799,16 +4809,16 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Dateinamen, die mit einem Punkt enden, werden von diesem Dateisystem nicht unterstützt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Öffnen oder erstellen der Sync-Datenbank nicht möglich. Bitte sicherstellen, dass Schreibrechte für den zu synchronisierenden Ordner existieren.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <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/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Öffnen oder erstellen der Sync-Datenbank nicht möglich. Bitte sicherstellen, dass Schreibrechte für den zu synchronisierenden Ordner existieren.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>Der Dateiname ist ein reservierter Name in diesem Dateisystem.</translation> @@ -4859,16 +4869,16 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Stat fehlgeschlagen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Dateikodierung ist ungültig</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Synchronisierungsprotokoll kann nicht geöffnet werden</translation> @@ -4879,16 +4889,16 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Ungültige Zeichen, bitte benennen Sie "%1" um</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation>Die Synchronisierung wird in Kürze fortgesetzt.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <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/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation>Die Synchronisierung wird in Kürze fortgesetzt.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5828,7 +5838,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation>Suche Dateien, Nachrichten und Termine …</translation> </message> @@ -5871,23 +5881,23 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Konto verbunden</translation> + <source>Current user status is online</source> + <translation>Aktueller Benutzerstatus ist Online</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Konto nicht verbunden</translation> + <source>Current user status is do not disturb</source> + <translation>Aktueller Benutzerstatus ist Nicht stören</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Aktueller Benutzerstatus ist Online</translation> + <source>Account connected</source> + <translation>Konto verbunden</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Aktueller Benutzerstatus ist Nicht stören</translation> + <source>Account not connected</source> + <translation>Konto nicht verbunden</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5900,7 +5910,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Konto entfernen</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Status setzen</translation> </message> @@ -6091,7 +6101,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Synchronisierung für alle pausieren</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Benutzerstatus setzen</translation> </message> @@ -6191,7 +6201,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Teilen-Dialog öffnen</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation>Einheitliche Suchergebnisliste</translation> </message> @@ -6202,7 +6212,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Weitere Aktionen anzeigen</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation>%1 - Dateiaktivitäten</translation> </message> diff --git a/translations/client_el.ts b/translations/client_el.ts index ca007aa8c..6f66f98fa 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -33,7 +33,7 @@ <message> <location filename="../src/gui/tray/ActivityItem.qml" line="240"/> <source>View activity</source> - <translation type="unfinished"/> + <translation>Εμφάνιση δραστηριότητας</translation> </message> </context> <context> @@ -851,7 +851,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/authenticationdialog.cpp" line="32"/> <source>Enter username and password for "%1" at %2.</source> - <translation type="unfinished"/> + <translation>Εισαγάγετε όνομα χρήστη και κωδικό πρόσβασης για το "%1" στο %2.</translation> </message> <message> <location filename="../src/gui/authenticationdialog.cpp" line="32"/> @@ -1027,7 +1027,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/connectionvalidator.cpp" line="159"/> <source>Timeout</source> - <translation type="unfinished"/> + <translation>Λήξη χρόνου</translation> </message> <message> <location filename="../src/gui/connectionvalidator.cpp" line="159"/> @@ -1125,7 +1125,7 @@ This can be an issue with your OpenSSL libraries.</source> <location filename="../src/gui/creds/flow2auth.cpp" line="118"/> <location filename="../src/gui/creds/flow2auth.cpp" line="226"/> <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> + <translation>Υπήρξε σφάλμα κατά την πρόσβαση στο "αναγνωριστικό": <br><em> %1</em></translation> </message> <message> <location filename="../src/gui/creds/flow2auth.cpp" line="121"/> @@ -1175,7 +1175,7 @@ This can be an issue with your OpenSSL libraries.</source> <message> <location filename="../src/gui/wizard/flow2authwidget.cpp" line="221"/> <source>Reopen Browser</source> - <translation type="unfinished"/> + <translation>Επανεκκίνηση περιηγητή</translation> </message> <message> <location filename="../src/gui/wizard/flow2authwidget.cpp" line="224"/> @@ -1346,13 +1346,6 @@ This means that the synchronization client might not upload local changes immedi Αυτό σημαίνει ότι η εφαρμογή δεν θα ανεβάσει τις τοπικές αλλαγές άμεσα, θα ελέγξει μόνο τις τοπικές αλλαγές και θα τις ανεβάσει περιοδικά (κάθε δύο ώρες από προεπιλογή).</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>Όλα τα αρχεία στον τοπικό σας φάκελο συγχρονισμού '% 1' διαγράφησαν. Αυτές οι διαγραφές θα συγχρονιστούν με τον διακομιστή σας, καθιστώντας τα αρχεία αυτά μη διαθέσιμα εκτός αν γίνει επαναφορά. Είστε βέβαιοι ότι θέλετε να συγχρονίσετε αυτές τις ενέργειες με τον διακομιστή; Εάν αυτό ήταν ατύχημα και αποφασίσετε να διατηρήσετε τα αρχεία σας, θα συγχρονιστούν ξανά από το διακομιστή.</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1052"/> <source>All files in the sync folder '%1' 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. @@ -1412,19 +1405,39 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Διατήρηση τοπικών αρχείων ως Διένεξη</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>Όλα τα αρχεία στο φάκελο συγχρονισμού '% 1' διαγράφηκαν στο διακομιστή. Αυτές οι διαγραφές θα συγχρονιστούν με τον τοπικό φάκελο συγχρονισμού, καθιστώντας αυτά τα αρχεία μη διαθέσιμα εκτός εάν έχετε δικαίωμα επαναφοράς. Εάν αποφασίσετε να επαναφέρετε τα αρχεία, θα συγχρονιστούν ξανά με τον διακομιστή, εφόσον έχετε τα δικαιώματα. Εάν αποφασίσετε να διαγράψετε τα αρχεία, θα είναι μη διαθέσιμα σε εσάς, εκτός εάν είστε ο κάτοχος.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>Όλα τα αρχεία στον τοπικό σας φάκελο συγχρονισμού '% 1' διαγράφησαν. Αυτές οι διαγραφές θα συγχρονιστούν με τον διακομιστή σας, καθιστώντας τα αρχεία αυτά μη διαθέσιμα εκτός αν γίνει επαναφορά. Είστε βέβαιοι ότι θέλετε να συγχρονίσετε αυτές τις ενέργειες με τον διακομιστή; Εάν αυτό ήταν ατύχημα και αποφασίσετε να διατηρήσετε τα αρχεία σας, θα συγχρονιστούν ξανά από το διακομιστή.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1255"/> <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. If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> + <translation>Όλα τα αρχεία στο φάκελο συγχρονισμού "%1" έχουν διαγραφεί από τον διακομιστή. +Αυτές οι διαγραφές θα συγχρονιστούν με τον τοπικό σας φάκελο, θέτοντας τα αρχεία μη διαθέσιμα, εκτός εάν έχετε δικαίωμα επαναφοράς. +Εάν αποφασίσετε να επαναφέρετε αυτά τα αρχεία, θα συγχρονιστούν εκ νέου, εφόσον έχετε το δικαίωμα. +Εφόσον επιλέξετε να διαγράψετε τα αρχεία, δε θα είναι διαθέσιμα σε εσάς, εκτός εάν είστε ο κάτοχος.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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"/> + <translation>Όλα τα αρχεία στον τοπικό σας φάκελο συγχρονισμού "% 1" διαγράφηκαν. Αυτές οι διαγραφές θα συγχρονιστούν με τον διακομιστή σας, καθιστώντας τα αρχεία μη διαθέσιμα εκτός αν γίνει επαναφορά τους. +Είστε βέβαιοι ότι θέλετε να συγχρονίσετε αυτές τις ενέργειες με τον διακομιστή; +Εάν έγινε λάθος και αποφασίσετε να διατηρήσετε τα αρχεία σας, θα συγχρονιστούν ξανά από το διακομιστή.</translation> </message> <message> <location filename="../src/gui/folder.cpp" line="1264"/> @@ -1437,14 +1450,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Κατάργηση όλων των αρχείων.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>Όλα τα αρχεία στο φάκελο συγχρονισμού '% 1' διαγράφηκαν στο διακομιστή. Αυτές οι διαγραφές θα συγχρονιστούν με τον τοπικό φάκελο συγχρονισμού, καθιστώντας αυτά τα αρχεία μη διαθέσιμα εκτός εάν έχετε δικαίωμα επαναφοράς. Εάν αποφασίσετε να επαναφέρετε τα αρχεία, θα συγχρονιστούν ξανά με τον διακομιστή, εφόσον έχετε τα δικαιώματα. Εάν αποφασίσετε να διαγράψετε τα αρχεία, θα είναι μη διαθέσιμα σε εσάς, εκτός εάν είστε ο κάτοχος.</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>Κράτησε τα αρχεία</translation> @@ -1491,9 +1496,9 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού '%1', αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμία εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> - <translation type="unfinished"/> + <translation>Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού "%1", αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλούμε βεβαιωθείτε ότι καμία εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή.</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1225"/> @@ -1846,7 +1851,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <message> <location filename="../src/gui/folderwizard.cpp" line="184"/> <source>Enter the name of the new folder to be created below "%1":</source> - <translation type="unfinished"/> + <translation>Εισαγάγετε το όνομα του νέου φακέλου που θα δημιουργηθεί παρακάτω "%1":</translation> </message> <message> <location filename="../src/gui/folderwizard.cpp" line="214"/> @@ -1895,7 +1900,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <location filename="../src/gui/folderwizard.cpp" line="512"/> <location filename="../src/gui/folderwizard.cpp" line="549"/> <source>Use virtual files instead of downloading content immediately %1</source> - <translation type="unfinished"/> + <translation>Χρησιμοποιήστε εικονικά αρχεία αντί να κατεβάσετε το περιεχόμενο άμεσα %1</translation> </message> <message> <location filename="../src/gui/folderwizard.cpp" line="512"/> @@ -2278,7 +2283,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="14"/> <source>Invalid filename</source> - <translation type="unfinished"/> + <translation>Μη έγκυρο όνομα αρχείου</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="23"/> @@ -2288,22 +2293,22 @@ Items where deletion is allowed will be deleted if they prevent a directory from <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="36"/> <source>Error</source> - <translation type="unfinished"/> + <translation>Σφάλμα</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="49"/> <source>Please enter a new name for the file:</source> - <translation type="unfinished"/> + <translation>Παρακαλούμε εισαγάγετε νέο όνομα για το αρχείο:</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="62"/> <source>New filename</source> - <translation type="unfinished"/> + <translation>Νέο όνομα αρχείου</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> <source>Rename file</source> - <translation type="unfinished"/> + <translation>Μετονομασία αρχείου</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="87"/> @@ -2313,27 +2318,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> - <translation type="unfinished"/> + <translation>Οι ακόλουθοι χαρακτήρες δεν επιτρέπονται στο σύστημα: * " | & ? , ; : \ / ~ < ></translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> <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"/> + <translation>Δεν έχετε τα απαραίτητα δικαιώματα για τη μετονομασία του αρχείου. Παρακαλούμε ρωτήστε τον κάτοχο του αρχείου να το μετονομάσει.</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> <source>Filename contains illegal characters: %1</source> - <translation type="unfinished"/> + <translation>Το όνομα αρχείου περιέχει μη αποδεκτούς χαρακτήρες: %1</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> <source>Could not rename file. Please make sure you are connected to the server.</source> - <translation type="unfinished"/> + <translation>Δεν είναι δυνατή η μετονομασία του αρχείου. Παρακαλούμε ελέγξτε τη σύνδεσή σας με το διακομιστή.</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> <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"/> + <translation>Δεν είναι δυνατή η μετονομασία του αρχείου καθώς χρησιμοποιείται ήδη στο διακομιστή. Παρακαλούμε επιλέξτε διαφορετικό.</translation> </message> </context> <context> @@ -2849,12 +2854,12 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>Συγχρονισμός του φακέλου «%1»</translation> </message> @@ -3346,14 +3351,24 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>αναγνωριστκό αρχείου (id)</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>ο διακομιστής δεν ανέφερε %1</translation> + <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="946"/> @@ -4160,7 +4175,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Κανένα αποτέλεσμα για '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4775,16 +4790,16 @@ 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="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Ανικανότητα στο άνοιγμα ή στη δημιουργία της τοπικής βάσης δεδομένων. Εξετάστε αν έχετε δικαιώματα εγγραφής στο φάκελο συγχρονισμού. </translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Τα ονόματα αρχείων που περιέχουν τον χαρακτήρα '% 1' δεν υποστηρίζονται σε αυτό το σύστημα αρχείων.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Ανικανότητα στο άνοιγμα ή στη δημιουργία της τοπικής βάσης δεδομένων. Εξετάστε αν έχετε δικαιώματα εγγραφής στο φάκελο συγχρονισμού. </translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>Το όνομα αρχείου είναι ένα κατοχυρωμένο όνομα σε αυτό το σύστημα αρχείων.</translation> @@ -4835,16 +4850,16 @@ 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="560"/> - <source>Unable to read from the sync journal.</source> - <translation>Αδυναμία ανάγνωσης από το ημερολόγιο συγχρονισμού.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="571"/> <source>Filename encoding is not valid</source> <translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> + <translation>Αδυναμία ανάγνωσης από το ημερολόγιο συγχρονισμού.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="643"/> <source>Cannot open the sync journal</source> <translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation> @@ -4855,16 +4870,16 @@ 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="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Ο χώρος δίσκου είναι χαμηλός: Οι λήψεις που θα μειώσουν τον ελέυθερο χώρο κάτω από %1 θα αγνοηθούν.</translation> @@ -5804,7 +5819,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5847,23 +5862,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Συνδεδεμένος λογαριασμός</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Ο λογαριασμός δεν συνδέθηκε</translation> + <source>Current user status is do not disturb</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Συνδεδεμένος λογαριασμός</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation type="unfinished"/> + <source>Account not connected</source> + <translation>Ο λογαριασμός δεν συνδέθηκε</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5876,7 +5891,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Ορισμός κατάστασης</translation> </message> @@ -6067,7 +6082,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Ορισμός κατάστασης χρήστη</translation> </message> @@ -6167,7 +6182,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6178,7 +6193,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index 647f59d52..a28212ef5 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -1344,13 +1344,6 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1405,7 +1398,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Keep Local Files as Conflict</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1413,7 +1421,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1430,14 +1438,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1484,7 +1484,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2838,12 +2838,12 @@ for additional privileges during the process.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3334,13 +3334,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4148,7 +4158,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>No results for '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4763,16 +4773,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>File names ending with a period are not supported on this file system.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>File names containing the character '%1' are not supported on this file system.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>The file name is a reserved name on this file system.</translation> @@ -4823,16 +4833,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stat failed.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Filename encoding is not valid</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Cannot open the sync journal</translation> @@ -4843,16 +4853,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Invalid characters, please rename "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>File name contains at least one invalid character</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5792,7 +5802,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5835,22 +5845,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> + <source>Current user status is online</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> + <source>Account connected</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5864,7 +5874,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6055,7 +6065,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6155,7 +6165,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6166,7 +6176,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_eo.ts b/translations/client_eo.ts index baa622523..59464c750 100644 --- a/translations/client_eo.ts +++ b/translations/client_eo.ts @@ -1344,13 +1344,6 @@ Tio signifas, ke la sinkroniga kliento eble ne alŝutas tuj lokajn ŝanĝojn kaj %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1410,7 +1403,22 @@ Se vi plu sinkronigas, la sinkronigo anstataŭigos ĉiujn viajn dosierojn per an <translation>Konservi la lokajn dosierojn kiel konfliktojn</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1418,7 +1426,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1435,14 +1443,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1489,7 +1489,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Malnova protokoldosiero „%1“ estis trovita, se ĝi ne estas forigebla. Bv. certigi, ke neniu aplikaĵo estas nuntempe uzanta ĝin.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2844,12 +2844,12 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3340,13 +3340,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4154,7 +4164,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Neniu rezulto por „%1“</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4768,16 +4778,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Dosieroj finantaj per punkto ne eblas en tiu ĉi dosiersistemo.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Ne eblas malfermi aŭ krei lokan sinkronigan datumbazon. Certigu, ke vi rajtas aliri al la sinkroniga dosierujo.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Dosieroj enhavantaj la signon „%1“ ne eblas en tiu ĉi dosiersistemo.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Ne eblas malfermi aŭ krei lokan sinkronigan datumbazon. Certigu, ke vi rajtas aliri al la sinkroniga dosierujo.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>Tiu ĉi dosiernomo ne estas permesata en tiu ĉi dosiersistemo.</translation> @@ -4828,16 +4838,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Statinformo malsukcesis.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Kodigi de dosiernomo ne validas</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Ne eblas malfermi la sinkronigan protokolon</translation> @@ -4848,16 +4858,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nevalidaj signoj, bv. alinomi „%1“</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>La dosiernomo enhavas almenaŭ unu nevalidan signon.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5797,7 +5807,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5840,22 +5850,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Konto konektita</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Konto konektita</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5869,7 +5879,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6060,7 +6070,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6160,7 +6170,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6171,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es.ts b/translations/client_es.ts index 677f1df13..756516226 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -1352,16 +1352,6 @@ Esto significa que el cliente de sincronización podría no subir inmediatamente %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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 los archivos en tu carpeta local de sincronización «%1» serán borrados. -Esta eliminación será sincronizada con tu servidor, haciendo que esos archivos no estén disponibles a no ser que sean restaurados. -¿Estás seguro de que deseas sincronizarte con el servidor? -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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1421,7 +1411,28 @@ Si continua con la sincronización todos los archivos serán remplazados por su <translation>Mantener los archivos locales en caso de conflicto</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>Todos los archivos en la carpeta de sincronización «%1» han sido eliminados en el servidor. +Esta eliminación se sincronizará con tu carpeta local sincronizada, haciendo que esos archivos ya no estén disponibles a no ser que tengas derecho a restaurarlos. +Si decides restaurar los archivos, volverán a sincronizarse con el servidor si tienes derecho a hacer esto. +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="1260"/> + <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 los archivos en tu carpeta local de sincronización «%1» serán borrados. +Esta eliminación será sincronizada con tu servidor, haciendo que esos archivos no estén disponibles a no ser que sean restaurados. +¿Estás seguro de que deseas sincronizarte con el servidor? +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="1255"/> <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. @@ -1432,7 +1443,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1452,17 +1463,6 @@ Si esto ha sido un accidente, y decides mantener tus archivos, serán re-sincron <translation>Eliminar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>Todos los archivos en la carpeta de sincronización «%1» han sido eliminados en el servidor. -Esta eliminación se sincronizará con tu carpeta local sincronizada, haciendo que esos archivos ya no estén disponibles a no ser que tengas derecho a restaurarlos. -Si decides restaurar los archivos, volverán a sincronizarse con el servidor si tienes derecho a hacer esto. -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"/> <source>Keep files</source> <translation>Mantener archivos</translation> @@ -1509,7 +1509,7 @@ Si decides eliminar los archivos, ya no los tendrás disponibles, a no ser que s <translation>Se ha encontrado un antiguo registro de sincronización '%1'; pero no se ha podido eliminar. Por favor, asegúrese de que ninguna aplicación la esté utilizando.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Se ha encontrado un registro de sincronización antiguo "%1", que no se ha podido eliminar. Por favor, asegúrese de que ninguna aplicación lo está utilizando en este momento.</translation> </message> @@ -2869,12 +2869,12 @@ for additional privileges during the process.</source> <translation>Los archivos virtuales no son compatibles con la carpeta raíz de la partición de Windows como carpeta local. Por favor, elija una subcarpeta válida bajo la letra de la unidad.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>%1 carpeta "%2" está sincronizada con la carpeta local "%3"</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>Sincronizar la carpeta "%1"</translation> </message> @@ -3372,14 +3372,24 @@ 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="490"/> + <source>permission</source> + <translation>permisos</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>identificador de archivo</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> + <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="946"/> @@ -4186,7 +4196,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>No hay resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>Sin resultados para "%1"</translation> </message> @@ -4547,7 +4557,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <message> <location filename="../src/gui/sslerrordialog.cpp" line="158"/> <source>Additional errors:</source> - <translation type="unfinished"/> + <translation>Errores adicionales:</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="166"/> @@ -4801,16 +4811,16 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Los nombres de archivo que terminan con un punto no son compatibles con este sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Imposible abrir o crear la BBDD local de sync. Asegurese de que tiene permisos de escritura en la carpeta de sync.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Los nombres de archivo que contengan el caracter '%1' no son compatibles con este sistema de archivos.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Imposible abrir o crear la BBDD local de sync. Asegurese de que tiene permisos de escritura en la carpeta de sync.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <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> @@ -4861,16 +4871,16 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Stat ha fallado.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Los caracteres del nombre de fichero no son válidos</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>No es posible abrir el diario de sincronización</translation> @@ -4881,16 +4891,16 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Caracteres inválidos, por favor renombre "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>Nombre de archivo contiene al menos un caracter no válido</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation>La sincronización continuará en breves.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -4939,7 +4949,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="169"/> <source>Some files could not be synced!</source> - <translation type="unfinished"/> + <translation>¡Algunos archivos no pueden ser sincronizados!</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="170"/> @@ -5042,22 +5052,22 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="373"/> <source>Failed to fetch providers.</source> - <translation type="unfinished"/> + <translation>Fallo al recuperar los proveedores.</translation> </message> <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="384"/> <source>Failed to fetch search providers for '%1'. Error: %2</source> - <translation type="unfinished"/> + <translation>Fallo al recuperar los proveedores de búsqueda para '%1'. Error: %2</translation> </message> <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="418"/> <source>Search has failed for '%2'.</source> - <translation type="unfinished"/> + <translation>La búsqueda ha fallado para '%2'.</translation> </message> <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="447"/> <source>Search has failed for '%1'. Error: %2</source> - <translation type="unfinished"/> + <translation>La búsqueda ha fallado para '%1'. Error: %2</translation> </message> </context> <context> @@ -5830,9 +5840,9 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> - <translation type="unfinished"/> + <translation>Buscando archivos, mensajes, eventos …</translation> </message> </context> <context> @@ -5840,7 +5850,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <message> <location filename="../src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml" line="24"/> <source>Load more results</source> - <translation type="unfinished"/> + <translation>Cargar más resultados</translation> </message> </context> <context> @@ -5848,7 +5858,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <message> <location filename="../src/gui/tray/UnifiedSearchResultItemSkeleton.qml" line="25"/> <source>Search result skeleton.</source> - <translation type="unfinished"/> + <translation>Árbol de resultados de la búsqueda</translation> </message> </context> <context> @@ -5856,7 +5866,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <message> <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/> <source>Load more results</source> - <translation type="unfinished"/> + <translation>Cargar más resultados</translation> </message> </context> <context> @@ -5873,23 +5883,23 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Cuenta conectada</translation> + <source>Current user status is online</source> + <translation>El estado actual del usuario es en línea</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Cuenta no conectada</translation> + <source>Current user status is do not disturb</source> + <translation>El estado actual del usuario es no molestar</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>El estado actual del usuario es en línea</translation> + <source>Account connected</source> + <translation>Cuenta conectada</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>El estado actual del usuario es no molestar</translation> + <source>Account not connected</source> + <translation>Cuenta no conectada</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5902,7 +5912,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Eliminar Cuenta</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Establecer estado</translation> </message> @@ -6093,7 +6103,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Pausar sincronización para todos</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Cambiar el estado del usuario</translation> </message> @@ -6193,9 +6203,9 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Abrir diálogo de compartir</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> - <translation type="unfinished"/> + <translation>Unificar la lista de resultados de la búsqueda</translation> </message> <message> <location filename="../src/gui/tray/Window.qml" line="720"/> @@ -6204,7 +6214,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Mostrar más acciones</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation>%1 - Actividad del archivo</translation> </message> diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts index 4e4c44d34..fe2d2cf82 100644 --- a/translations/client_es_AR.ts +++ b/translations/client_es_AR.ts @@ -1338,13 +1338,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1397,7 +1390,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Mantener Archivos Locales como Conflicto</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1405,7 +1413,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1422,14 +1430,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1476,7 +1476,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Una antigua sincronización con journaling '%1' fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2825,12 +2825,12 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3321,13 +3321,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4135,7 +4145,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/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4748,13 +4758,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/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <location filename="../src/libsync/syncengine.cpp" line="507"/> + <source>File names containing the character '%1' are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="507"/> - <source>File names containing the character '%1' are not supported on this file system.</source> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation type="unfinished"/> </message> <message> @@ -4808,13 +4818,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/libsync/syncengine.cpp" line="560"/> - <source>Unable to read from the sync journal.</source> + <location filename="../src/libsync/syncengine.cpp" line="571"/> + <source>Filename encoding is not valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> - <source>Filename encoding is not valid</source> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> <translation type="unfinished"/> </message> <message> @@ -4828,13 +4838,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/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> + <location filename="../src/libsync/syncengine.cpp" line="1110"/> + <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1110"/> - <source>File name contains at least one invalid character</source> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> @@ -5777,7 +5787,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5820,22 +5830,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Cuenta conectada</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Cuenta conectada</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5849,7 +5859,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6040,7 +6050,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6140,7 +6150,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6151,7 +6161,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts index 40cb69272..1a8eab702 100644 --- a/translations/client_es_CL.ts +++ b/translations/client_es_CL.ts @@ -1340,13 +1340,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1402,7 +1395,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Mantener los Archivos Locales como Conflictos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1410,7 +1418,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1427,14 +1435,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1481,7 +1481,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2831,12 +2831,12 @@ mas privilegios durante el proceso.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3327,13 +3327,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4141,7 +4151,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4756,16 +4766,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Los nombres de archivos que terminan en punto no están siportados en este sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Los nombres de archivos que contengan el caracter '%1' no son soportados en este sistema de archivos.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>El nombre del archivo está reservado en este sistema de archivos.</translation> @@ -4816,16 +4826,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stat falló.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> @@ -4836,16 +4846,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Caracteres inválidos, por favor renombra "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5785,7 +5795,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5828,22 +5838,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> + <source>Current user status is online</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> + <source>Account connected</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5857,7 +5867,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6048,7 +6058,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6148,7 +6158,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6159,7 +6169,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts index 188a22606..4bcb8f11a 100644 --- a/translations/client_es_CO.ts +++ b/translations/client_es_CO.ts @@ -1340,13 +1340,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1402,7 +1395,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Mantener los Archivos Locales como Conflictos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1410,7 +1418,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1427,14 +1435,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1481,7 +1481,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2831,12 +2831,12 @@ mas privilegios durante el proceso.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3327,13 +3327,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4141,7 +4151,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4756,16 +4766,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Los nombres de archivos que terminan en punto no están siportados en este sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Los nombres de archivos que contengan el caracter '%1' no son soportados en este sistema de archivos.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>El nombre del archivo está reservado en este sistema de archivos.</translation> @@ -4816,16 +4826,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stat falló.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> @@ -4836,16 +4846,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Caracteres inválidos, por favor renombra "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5785,7 +5795,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5828,22 +5838,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> + <source>Current user status is online</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> + <source>Account connected</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5857,7 +5867,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6048,7 +6058,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6148,7 +6158,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6159,7 +6169,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts index 0f8f1fc0d..9ba0fdc53 100644 --- a/translations/client_es_CR.ts +++ b/translations/client_es_CR.ts @@ -1340,13 +1340,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1402,7 +1395,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Mantener los Archivos Locales como Conflictos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1410,7 +1418,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1427,14 +1435,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1481,7 +1481,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2831,12 +2831,12 @@ mas privilegios durante el proceso.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3327,13 +3327,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4141,7 +4151,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4756,16 +4766,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Los nombres de archivos que terminan en punto no están siportados en este sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Los nombres de archivos que contengan el caracter '%1' no son soportados en este sistema de archivos.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>El nombre del archivo está reservado en este sistema de archivos.</translation> @@ -4816,16 +4826,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stat falló.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> @@ -4836,16 +4846,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Caracteres inválidos, por favor renombra "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5785,7 +5795,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5828,22 +5838,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> + <source>Current user status is online</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> + <source>Account connected</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5857,7 +5867,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6048,7 +6058,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6148,7 +6158,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6159,7 +6169,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts index 220d2cd56..33914c2a4 100644 --- a/translations/client_es_DO.ts +++ b/translations/client_es_DO.ts @@ -1340,13 +1340,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1402,7 +1395,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Mantener los Archivos Locales como Conflictos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1410,7 +1418,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1427,14 +1435,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1481,7 +1481,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2831,12 +2831,12 @@ mas privilegios durante el proceso.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3327,13 +3327,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4141,7 +4151,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4756,16 +4766,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Los nombres de archivos que terminan en punto no están siportados en este sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Los nombres de archivos que contengan el caracter '%1' no son soportados en este sistema de archivos.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>El nombre del archivo está reservado en este sistema de archivos.</translation> @@ -4816,16 +4826,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stat falló.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> @@ -4836,16 +4846,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Caracteres inválidos, por favor renombra "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5785,7 +5795,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5828,22 +5838,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> + <source>Current user status is online</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> + <source>Account connected</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5857,7 +5867,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6048,7 +6058,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6148,7 +6158,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6159,7 +6169,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts index 0db0f0049..9a047e301 100644 --- a/translations/client_es_EC.ts +++ b/translations/client_es_EC.ts @@ -1340,13 +1340,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1402,7 +1395,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Mantener los Archivos Locales como Conflictos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1410,7 +1418,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1427,14 +1435,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1481,7 +1481,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2831,12 +2831,12 @@ mas privilegios durante el proceso.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3327,13 +3327,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4141,7 +4151,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4756,16 +4766,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Los nombres de archivos que terminan en punto no están siportados en este sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Los nombres de archivos que contengan el caracter '%1' no son soportados en este sistema de archivos.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>El nombre del archivo está reservado en este sistema de archivos.</translation> @@ -4816,16 +4826,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stat falló.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> @@ -4836,16 +4846,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Caracteres inválidos, por favor renombra "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5785,7 +5795,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5828,22 +5838,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> + <source>Current user status is online</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> + <source>Account connected</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5857,7 +5867,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6048,7 +6058,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6148,7 +6158,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6159,7 +6169,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts index 099fe9dbd..bdd15d097 100644 --- a/translations/client_es_GT.ts +++ b/translations/client_es_GT.ts @@ -1340,13 +1340,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1402,7 +1395,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Mantener los Archivos Locales como Conflictos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1410,7 +1418,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1427,14 +1435,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1481,7 +1481,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2831,12 +2831,12 @@ mas privilegios durante el proceso.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3327,13 +3327,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4141,7 +4151,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4756,16 +4766,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Los nombres de archivos que terminan en punto no están siportados en este sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Los nombres de archivos que contengan el caracter '%1' no son soportados en este sistema de archivos.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>El nombre del archivo está reservado en este sistema de archivos.</translation> @@ -4816,16 +4826,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stat falló.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> @@ -4836,16 +4846,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Caracteres inválidos, por favor renombra "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5785,7 +5795,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5828,22 +5838,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> + <source>Current user status is online</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> + <source>Account connected</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5857,7 +5867,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6048,7 +6058,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6148,7 +6158,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6159,7 +6169,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts index 20073cf6a..ed824b290 100644 --- a/translations/client_es_HN.ts +++ b/translations/client_es_HN.ts @@ -1340,13 +1340,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1402,7 +1395,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Mantener los Archivos Locales como Conflictos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1410,7 +1418,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1427,14 +1435,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1481,7 +1481,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2831,12 +2831,12 @@ mas privilegios durante el proceso.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3327,13 +3327,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4141,7 +4151,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4756,16 +4766,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Los nombres de archivos que terminan en punto no están siportados en este sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Los nombres de archivos que contengan el caracter '%1' no son soportados en este sistema de archivos.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>El nombre del archivo está reservado en este sistema de archivos.</translation> @@ -4816,16 +4826,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stat falló.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> @@ -4836,16 +4846,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Caracteres inválidos, por favor renombra "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5785,7 +5795,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5828,22 +5838,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> + <source>Current user status is online</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> + <source>Account connected</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5857,7 +5867,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6048,7 +6058,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6148,7 +6158,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6159,7 +6169,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts index 99a8f43ac..cfe749087 100644 --- a/translations/client_es_MX.ts +++ b/translations/client_es_MX.ts @@ -1340,13 +1340,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1402,7 +1395,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Mantener los Archivos Locales como Conflictos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1410,7 +1418,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1427,14 +1435,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1481,7 +1481,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2831,12 +2831,12 @@ mas privilegios durante el proceso.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3327,13 +3327,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4141,7 +4151,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4756,16 +4766,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Los nombres de archivos que terminan en punto no están siportados en este sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Los nombres de archivos que contengan el caracter '%1' no son soportados en este sistema de archivos.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>El nombre del archivo está reservado en este sistema de archivos.</translation> @@ -4816,16 +4826,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stat falló.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> @@ -4836,16 +4846,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Caracteres inválidos, por favor renombra "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5785,7 +5795,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5828,22 +5838,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> + <source>Current user status is online</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> + <source>Account connected</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5857,7 +5867,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6048,7 +6058,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6148,7 +6158,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6159,7 +6169,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts index 56b6f4e19..47f94020a 100644 --- a/translations/client_es_SV.ts +++ b/translations/client_es_SV.ts @@ -1340,13 +1340,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1402,7 +1395,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Mantener los Archivos Locales como Conflictos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1410,7 +1418,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1427,14 +1435,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1481,7 +1481,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2831,12 +2831,12 @@ mas privilegios durante el proceso.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3327,13 +3327,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4141,7 +4151,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4756,16 +4766,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Los nombres de archivos que terminan en punto no están siportados en este sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Los nombres de archivos que contengan el caracter '%1' no son soportados en este sistema de archivos.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>No fue posible abrir o crear la base de datos de sincronización local. Asegúrate de que tengas permisos de escritura en la carpeta de sincronización.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>El nombre del archivo está reservado en este sistema de archivos.</translation> @@ -4816,16 +4826,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stat falló.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>La codificación del nombre del archivo no es válida</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>No se puede abrir el diario de sincronización</translation> @@ -4836,16 +4846,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Caracteres inválidos, por favor renombra "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>El nombre del archivo contiene al menos un caracter inválido</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5785,7 +5795,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5828,22 +5838,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> + <source>Current user status is online</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> + <source>Account connected</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5857,7 +5867,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6048,7 +6058,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6148,7 +6158,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6159,7 +6169,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_et.ts b/translations/client_et.ts index a6633b2e9..a6e818713 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -1338,13 +1338,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1397,7 +1390,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1405,7 +1413,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1422,14 +1430,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1476,7 +1476,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Leiti vana sünkroniseeringu zurnaal '%1', kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2825,12 +2825,12 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3321,13 +3321,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4135,7 +4145,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/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4750,13 +4760,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/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <location filename="../src/libsync/syncengine.cpp" line="507"/> + <source>File names containing the character '%1' are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="507"/> - <source>File names containing the character '%1' are not supported on this file system.</source> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation type="unfinished"/> </message> <message> @@ -4810,16 +4820,16 @@ 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="560"/> - <source>Unable to read from the sync journal.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="571"/> <source>Filename encoding is not valid</source> <translation>Failinime kodeering pole kehtiv</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="643"/> <source>Cannot open the sync journal</source> <translation>Ei suuda avada sünkroniseeringu zurnaali</translation> @@ -4830,16 +4840,16 @@ 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="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>Faili nimesonvähemalt üks keelatud märk</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> @@ -5779,7 +5789,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5822,22 +5832,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> + <source>Current user status is online</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> + <source>Account connected</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5851,7 +5861,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6042,7 +6052,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6142,7 +6152,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6153,7 +6163,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_eu.ts b/translations/client_eu.ts index c24b19cd1..0e8b3adad 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -1352,15 +1352,6 @@ Honek esan nahi du sinkronizazio bezeroak agian ez duela berehalakoan kargatuko %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>Zure tokiko '%1' sinkronizazio karpetako fitxategi guztiak ezabatu dira. Ezabaketa hauek zerbitzarian sinkronizatuko dira, beraz ezingo dituzu fitxategiok erabili leheneratu ezean. -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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1421,7 +1412,27 @@ Nahi al duzu zure tokiko fitxategi berrienak gatazkako fitxategi gisa mantentzea <translation>Mantendu fitxategi lokalak gatazka gisa</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>'% 1' sinkronizazio-karpetaren fitxategi guztiak ezabatuko dira zerbitzaritik. +Ezabaketa horiek zure sinkronizazio-karpetan sinkronizatuko dira, eta horren ondorioz fitxategiak ezingo dituzu berriro erabili leheneratzeko eskubiderik ez baduzu. +Fitxategiak leheneratzea erabakitzen baduzu, zerbitzariarekin berriro sinkronizatuko dira horretarako eskubiderik baduzu. +Fitxategiak ezabatzea erabakitzen baduzu, ez dira erabilgarri egongo, jabea izan ezean.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>Zure tokiko '%1' sinkronizazio karpetako fitxategi guztiak ezabatu dira. Ezabaketa hauek zerbitzarian sinkronizatuko dira, beraz ezingo dituzu fitxategiok erabili leheneratu ezean. +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="1255"/> <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. @@ -1432,7 +1443,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1451,17 +1462,6 @@ Istripua izan bada eta zure fitxategiak mantentzea erabakitzen baduzu, zerbitzar <translation>Ezabatu fitxategi guztiak</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>'% 1' sinkronizazio-karpetaren fitxategi guztiak ezabatuko dira zerbitzaritik. -Ezabaketa horiek zure sinkronizazio-karpetan sinkronizatuko dira, eta horren ondorioz fitxategiak ezingo dituzu berriro erabili leheneratzeko eskubiderik ez baduzu. -Fitxategiak leheneratzea erabakitzen baduzu, zerbitzariarekin berriro sinkronizatuko dira horretarako eskubiderik baduzu. -Fitxategiak ezabatzea erabakitzen baduzu, ez dira erabilgarri egongo, jabea izan ezean.</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>Mantendu fitxategiak</translation> @@ -1508,7 +1508,7 @@ Fitxategiak ezabatzea erabakitzen baduzu, ez dira erabilgarri egongo, jabea izan <translation>Aurkitu da '%1' sinkronizazio erregistro zaharra, baina ezin da ezabatu. Ziurtatu aplikaziorik ez dela erabiltzen ari.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>"% 1" sinkronizazio egunkari zahar bat aurkitu da, baina ezin izan da kendu. Ziurtatu ez dela aplikaziorik erabiltzen ari.</translation> </message> @@ -2868,12 +2868,12 @@ pribilegio gehigarriak eskatzen ahal dizu prozesuan.</translation> <translation>Fitxategi birtualak ez dira bateragarriak Windows partizio sustraiekin karpeta lokal bezala. Mesedez aukeratu baliozko azpikarpeta bat diskoaren letra azpian.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>%1 karpeta "%2" lokaleko "%3" karpetan dago sinkronizatuta</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>Sinkronizatu "%1" karpeta</translation> </message> @@ -3278,12 +3278,12 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <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"/> + <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 type="unfinished"/> + <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="250"/> @@ -3371,14 +3371,24 @@ 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="490"/> + <source>permission</source> + <translation>baimena</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>fitxategiaren id-a</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> + <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="946"/> @@ -4185,7 +4195,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Ez dago emaitzarik '%1'(r)entzako</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>Ez dago "% 1" (r)entzako emaitzarik</translation> </message> @@ -4546,7 +4556,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <message> <location filename="../src/gui/sslerrordialog.cpp" line="158"/> <source>Additional errors:</source> - <translation type="unfinished"/> + <translation>Errore gehigarriak:</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="166"/> @@ -4800,16 +4810,16 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Puntu batekin amaitzen diren fitxategi-izenak ez dira onartzen fitxategi-sistema honetan.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Ezin izan da ireki edo sortu datu-base lokal sinkronizatua. Ziurtatu idazteko baimena daukazula karpeta sinkronizatu lokalean. </translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <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/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Ezin izan da ireki edo sortu datu-base lokal sinkronizatua. Ziurtatu idazteko baimena daukazula karpeta sinkronizatu lokalean. </translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>Fitxategi-izena izen erreserbatua da fitxategi-sistema honetan.</translation> @@ -4860,16 +4870,16 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Hasierak huts egin du.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Fitxategiaren kodeketa baliogabea da</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Ezin da sinkronizazio egunerokoa ireki</translation> @@ -4880,16 +4890,16 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Baliogabeko karaktereak, aldatu "%1" izena</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation>Sinkronizazioak laster jarraituko du.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <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/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation>Sinkronizazioak laster jarraituko du.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5041,22 +5051,22 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="373"/> <source>Failed to fetch providers.</source> - <translation type="unfinished"/> + <translation>Ezin izan dira hornitzaileak atzitu.</translation> </message> <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="384"/> <source>Failed to fetch search providers for '%1'. Error: %2</source> - <translation type="unfinished"/> + <translation>Ezin izan dira bilaketa hornitzaileak lortu '%1?-(r)entzat. Errorea: %2</translation> </message> <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="418"/> <source>Search has failed for '%2'.</source> - <translation type="unfinished"/> + <translation>'%2' bilaketak huts egin du.</translation> </message> <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="447"/> <source>Search has failed for '%1'. Error: %2</source> - <translation type="unfinished"/> + <translation>'%1' bilaketak huts egin du. Errorea: %2</translation> </message> </context> <context> @@ -5829,9 +5839,9 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> - <translation type="unfinished"/> + <translation>Bilatu fitxategiak, mezuak, gertaerak ...</translation> </message> </context> <context> @@ -5839,7 +5849,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <message> <location filename="../src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml" line="24"/> <source>Load more results</source> - <translation type="unfinished"/> + <translation>Kargatu emaitza gehiago </translation> </message> </context> <context> @@ -5847,7 +5857,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <message> <location filename="../src/gui/tray/UnifiedSearchResultItemSkeleton.qml" line="25"/> <source>Search result skeleton.</source> - <translation type="unfinished"/> + <translation>Bilaketa emaitzen eskeletoa.</translation> </message> </context> <context> @@ -5855,7 +5865,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <message> <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/> <source>Load more results</source> - <translation type="unfinished"/> + <translation>Kargatu emaitza gehiago </translation> </message> </context> <context> @@ -5872,23 +5882,23 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Kontua konektatuta</translation> + <source>Current user status is online</source> + <translation>Erabiltzailea linean dago</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Kontua ez dago konektatuta</translation> + <source>Current user status is do not disturb</source> + <translation>Erabiltzailea 'ez molestatu' egoeran dago</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Erabiltzailea linean dago</translation> + <source>Account connected</source> + <translation>Kontua konektatuta</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Erabiltzailea 'ez molestatu' egoeran dago</translation> + <source>Account not connected</source> + <translation>Kontua ez dago konektatuta</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5901,7 +5911,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Kendu kontua</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Ezarri egoera</translation> </message> @@ -6092,7 +6102,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Pausatu sinkronizazioa guztientzat</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Ezarri erabiltzaile-egoera</translation> </message> @@ -6192,9 +6202,9 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Ireki partekatzeko elkarrizketa-koadroa</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> - <translation type="unfinished"/> + <translation>Bateratutako bilaketaren emaitzen zerrenda</translation> </message> <message> <location filename="../src/gui/tray/Window.qml" line="720"/> @@ -6203,7 +6213,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Erakutsi ekintza gehiago</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation>%1 - Fitxategiaren jarduera</translation> </message> diff --git a/translations/client_fa.ts b/translations/client_fa.ts index c07c89e8c..9d420d0dd 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -1340,13 +1340,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1401,7 +1394,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>پرونده های محلی را به عنوان ناسازگار نگه دارید</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1409,7 +1417,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1426,14 +1434,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1480,7 +1480,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>یک مجله همگام قدیمی '1%' پیدا شد، اما حذف نمی شود. لطفا مطمئن شوید که هیچ برنامه ای در حال حاضر از آن استفاده نمی کند.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2829,12 +2829,12 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3325,13 +3325,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4139,7 +4149,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>هیچ نتیجه ای برای '1%' وجود ندارد</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4753,16 +4763,16 @@ 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="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>پایگاه داده محلی باز یا ساخته نمی شود. اطمینان حاصل کنید که دسترسی به نوشتن در پوشه همگام سازی دارید.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>نام پرونده هایی که شامل کاراکتر '1%' هستند در این سیستم پرونده پشتیبانی نشده اند.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>پایگاه داده محلی باز یا ساخته نمی شود. اطمینان حاصل کنید که دسترسی به نوشتن در پوشه همگام سازی دارید.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>نام پرونده یک نام رزرو شده در این سیستم پرونده است.</translation> @@ -4813,16 +4823,16 @@ 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="560"/> - <source>Unable to read from the sync journal.</source> - <translation>نمی توان از مجله همگام ساز خواند.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="571"/> <source>Filename encoding is not valid</source> <translation>رمزگذاری نام فایل معتبر نیست</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> + <translation>نمی توان از مجله همگام ساز خواند.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="643"/> <source>Cannot open the sync journal</source> <translation>نمی توان مجله همگام ساز را باز کرد</translation> @@ -4833,16 +4843,16 @@ 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="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>نام فایل دارای حداقل یک کاراکتر نامعتبر است</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>فضای دیسک کم است: دانلودهایی که فضای آزاد را به کمتر از 1% کاهش می دهند رد می شوند.</translation> @@ -5782,7 +5792,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5825,22 +5835,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> + <source>Current user status is online</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> + <source>Account connected</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5854,7 +5864,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6045,7 +6055,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6145,7 +6155,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6156,7 +6166,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_fi.ts b/translations/client_fi.ts index 8ccbe0f02..e1f75f782 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -160,7 +160,7 @@ <message> <location filename="../src/libsync/filesystem.cpp" line="158"/> <source>Error removing "%1": %2</source> - <translation type="unfinished"/> + <translation>Virhe poistaessa "%1": %2</translation> </message> <message> <location filename="../src/libsync/filesystem.cpp" line="158"/> @@ -170,7 +170,7 @@ <message> <location filename="../src/libsync/filesystem.cpp" line="174"/> <source>Could not remove folder "%1"</source> - <translation type="unfinished"/> + <translation>Ei voitu poistaa kansiota "%1"</translation> </message> <message> <location filename="../src/libsync/filesystem.cpp" line="174"/> @@ -649,7 +649,7 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation> <message> <location filename="../src/gui/accountsettings.cpp" line="1151"/> <source>Server configuration error: %1 at %2.</source> - <translation type="unfinished"/> + <translation>Palvelimen kokoonpanovirhe: %1 at %2.</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="1162"/> @@ -1347,13 +1347,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1406,7 +1399,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Pidä paikalliset tiedostot konfliktina</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1414,7 +1422,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1431,14 +1439,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Poista kaikki tiedostot</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>Pidä tiedostot</translation> @@ -1485,7 +1485,7 @@ 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/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2103,7 +2103,7 @@ Note that this selects only what pool upgrades are taken from, and that there ar <message> <location filename="../src/gui/generalsettings.cpp" line="418"/> <source>Zip Archives</source> - <translation type="unfinished"/> + <translation>Zip-arkistot</translation> </message> <message> <location filename="../src/gui/generalsettings.cpp" line="424"/> @@ -2651,7 +2651,7 @@ Logs will be written to %1</source> <message> <location filename="../src/gui/creds/oauth.cpp" line="121"/> <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> + <translation>Tyhjä JSON OAuth2-uudelleenohjauksesta</translation> </message> <message> <location filename="../src/gui/creds/oauth.cpp" line="126"/> @@ -2838,12 +2838,12 @@ for additional privileges during the process.</source> <translation>Windows ei tue virtuaalitiedostoja levyosioiden juurihakemistoissa. Valitse alikansio.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>Synkronoi kansio "%1"</translation> </message> @@ -3252,7 +3252,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/discovery.cpp" line="250"/> <source>Symbolic links are not supported in syncing.</source> - <translation type="unfinished"/> + <translation>Symboliset linkit eivät ole tuettuja synkronoinnissa.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="258"/> @@ -3335,13 +3335,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>tiedoston id</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4149,7 +4159,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ei tuloksia haulla '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>Ei tuloksia haulla "%1"</translation> </message> @@ -4764,16 +4774,16 @@ 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="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Tässä tiedostojärjestelmässä ei voi käyttää tiedostojen nimessä merkkiä '%1'.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"/> @@ -4824,16 +4834,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stat epäonnistui.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <source>Unable to read from the sync journal.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="571"/> <source>Filename encoding is not valid</source> <translation>Tiedostonimen merkistökoodaus ei ole kelvollista</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="643"/> <source>Cannot open the sync journal</source> <translation type="unfinished"/> @@ -4844,16 +4854,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Virheellisiä merkkejä, anna uusi nimi kohteelle "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <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/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -4877,17 +4887,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <location filename="../src/gui/tray/syncstatussummary.cpp" line="316"/> <location filename="../src/gui/tray/syncstatussummary.h" line="89"/> <source>All synced!</source> - <translation type="unfinished"/> + <translation>Kaikki synkronoitu!</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="147"/> <source>Some files couldn't be synced!</source> - <translation type="unfinished"/> + <translation>Joitain tiedostoja ei voitu synkronoida!</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="148"/> <source>See below for errors</source> - <translation type="unfinished"/> + <translation>Katso virheet alapuolelta</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="155"/> @@ -4897,27 +4907,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="162"/> <source>Sync paused</source> - <translation type="unfinished"/> + <translation>Synkronointi keskeytetty</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="169"/> <source>Some files could not be synced!</source> - <translation type="unfinished"/> + <translation>Joitain tiedostoja ei voitu synkronoida!</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="170"/> <source>See below for warnings</source> - <translation type="unfinished"/> + <translation>Katso varoitukset alapuolelta</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="218"/> <source>%1 of %2 · %3 left</source> - <translation type="unfinished"/> + <translation>%1/%2 · %3 jäljellä</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="222"/> <source>%1 of %2</source> - <translation type="unfinished"/> + <translation>%1/%2</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="227"/> @@ -5104,7 +5114,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="156"/> <source>Could not set user status. Make sure you are connected to the server.</source> - <translation type="unfinished"/> + <translation>Käyttäjän tilatietoa ei voitu asettaa. Varmista että olet yhdistettynä palvelimeen.</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="160"/> @@ -5115,7 +5125,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <location filename="../src/gui/userstatusselectormodel.cpp" line="358"/> <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/> <source>Don't clear</source> - <translation type="unfinished"/> + <translation>Älä tyhjennä</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> @@ -5148,32 +5158,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> <source>Less than a minute</source> - <translation type="unfinished"/> + <translation>Alle minuutti</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> <source>1 minute</source> - <translation type="unfinished"/> + <translation>1 minuutti</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> <source>%1 minutes</source> - <translation type="unfinished"/> + <translation>%1 minuuttia</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> <source>%1 hours</source> - <translation type="unfinished"/> + <translation>%1 tuntia</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> <source>1 day</source> - <translation type="unfinished"/> + <translation>1 päivä</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> <source>%1 days</source> - <translation type="unfinished"/> + <translation>%1 päivää</translation> </message> </context> <context> @@ -5793,9 +5803,9 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> - <translation type="unfinished"/> + <translation>Etsi tiedostoja, viestejä, tapahtumia…</translation> </message> </context> <context> @@ -5803,7 +5813,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml" line="24"/> <source>Load more results</source> - <translation type="unfinished"/> + <translation>Lataa lisää tuloksia</translation> </message> </context> <context> @@ -5819,7 +5829,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/> <source>Load more results</source> - <translation type="unfinished"/> + <translation>Lataa lisää tuloksia</translation> </message> </context> <context> @@ -5836,23 +5846,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Tili yhdistetty</translation> + <source>Current user status is online</source> + <translation>Nykyinen käyttäjän tila on Online</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Tiliä ei yhdistetty</translation> + <source>Current user status is do not disturb</source> + <translation>Nykyinen käyttäjän tila on 'Älä häiritse'</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Nykyinen käyttäjän tila on Online</translation> + <source>Account connected</source> + <translation>Tili yhdistetty</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Nykyinen käyttäjän tila on 'Älä häiritse'</translation> + <source>Account not connected</source> + <translation>Tiliä ei yhdistetty</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5865,7 +5875,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Poista tili</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Aseta tilatieto</translation> </message> @@ -6056,7 +6066,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Tauota synkronointi</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Aseta käyttäjän tila</translation> </message> @@ -6156,7 +6166,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Avaa jakoikkuna</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6167,7 +6177,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Näytä lisää toimintoja</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> @@ -6576,7 +6586,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/vfs/cfapi/vfs_cfapi.cpp" line="333"/> <source>Download of end-to-end encrypted file failed</source> - <translation type="unfinished"/> + <translation>Päästä päähän -salatun tiedoston lataaminen epäonnistui</translation> </message> <message> <location filename="../src/libsync/vfs/cfapi/vfs_cfapi.cpp" line="334"/> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 0d2b7536e..9812c8cab 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -1352,15 +1352,6 @@ Cela signifie que le client de synchronisation peut ne pas télécharger immédi </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>Tous les fichiers contenus dans le dossier synchronisé '%1' ont été supprimés. Ces suppressions seront synchronisées avec votre serveur, rendant ces fichiers inaccessibles sauf s'ils sont restaurés. -Êtes-vous sûr de vouloir synchroniser ces actions avec le serveur ? -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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1420,7 +1411,27 @@ Continuer la synchronisation comme d'habitude fera en sorte que tous les fi <translation>Conserver les fichiers locaux comme Conflits</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>Tous les fichiers du dossier de synchronisation '%1' ont été supprimés sur le serveur. +Ces suppressions seront synchronisées avec votre dossier local, ce qui rendra les fichiers non disponibles à moins que vous ayez les droits de les restaurer. +Si vous décidez de garder ces fichiers, ils seront resynchronisés avec le serveur si vous avez les droits pour le faire. +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="1260"/> + <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>Tous les fichiers contenus dans le dossier synchronisé '%1' ont été supprimés. Ces suppressions seront synchronisées avec votre serveur, rendant ces fichiers inaccessibles sauf s'ils sont restaurés. +Êtes-vous sûr de vouloir synchroniser ces actions avec le serveur ? +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="1255"/> <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. @@ -1431,7 +1442,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1450,17 +1461,6 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <translation>Supprimer tous les fichiers</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>Tous les fichiers du dossier de synchronisation '%1' ont été supprimés sur le serveur. -Ces suppressions seront synchronisées avec votre dossier local, ce qui rendra les fichiers non disponibles à moins que vous ayez les droits de les restaurer. -Si vous décidez de garder ces fichiers, ils seront resynchronisés avec le serveur si vous avez les droits pour le faire. -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"/> <source>Keep files</source> <translation>Conserver les fichiers</translation> @@ -1507,7 +1507,7 @@ Si vous décidez de supprimer ces fichiers, ils ne vous seront plus accessibles <translation>Un ancien fichier journal '%1' a été trouvé, mais ne peut être supprimé. Veuillez vous assurer qu’aucune application ne l'utilise en ce moment.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Un ancien fichier journal "%1" a été trouvé, mais ne peut être supprimé. Veuillez vous assurer qu’aucune application ne l'utilise en ce moment.</translation> </message> @@ -2785,7 +2785,7 @@ L'assistant de mise à jour peut vous demandez des autorisations supplémen <message> <location filename="../src/gui/updater/ocupdater.cpp" line="161"/> <source>New %1 is available. Please open %2 to download the update.</source> - <translation type="unfinished"/> + <translation>Un nouveau %1 est disponible. Merci d'ouvrir %2 pour télécharger la mise à jour.</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> @@ -2868,12 +2868,12 @@ L'assistant de mise à jour peut vous demandez des autorisations supplémen <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>Le dossier %1 "%2" est synchronisé avec le dossier local "%3".</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>Synchroniser le dossier "%1"</translation> </message> @@ -3207,7 +3207,7 @@ Il est déconseillé de l'utiliser.</translation> <message> <location filename="../src/gui/owncloudsetupwizard.cpp" line="630"/> <source>Cannot remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> - <translation type="unfinished"/> + <translation>Impossible de supprimer et sauvegarder le dossier parce que le dossier ou un fichier qu'il contient est ouvert dans un autre programme. Merci de fermer le dossier ou le fichier et recommencer ou annuler la configuration.</translation> </message> <message> <location filename="../src/gui/owncloudsetupwizard.cpp" line="683"/> @@ -3365,13 +3365,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss <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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>ID du fichier</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -3427,7 +3437,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/discovery.cpp" line="1548"/> <source>Server replied with an error while reading directory '%1' : %2</source> - <translation type="unfinished"/> + <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="1635"/> @@ -4180,7 +4190,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Aucun résultat pour '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>Aucun résultat pour "%1"</translation> </message> @@ -4795,16 +4805,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Les noms de fichier se terminant par un point ne sont pas pris en charge sur votre système.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Impossible d'accéder ou de créer une base de données locale de synchronisation. Assurez vous de disposer des droits d'écriture dans le dossier de synchronisation.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <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/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Impossible d'accéder ou de créer une base de données locale de synchronisation. Assurez vous de disposer des droits d'écriture dans le dossier de synchronisation.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>Le nom du fichier est réservé sur votre système.</translation> @@ -4855,16 +4865,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stat échoué.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>L'encodage du nom de fichier n'est pas valide</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Impossible d'ouvrir le journal de synchronisation</translation> @@ -4875,16 +4885,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Caractères non valides. Veuillez renommer "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>Le nom de fichier contient au moins un caractère non valable</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5135,7 +5145,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="156"/> <source>Could not set user status. Make sure you are connected to the server.</source> - <translation type="unfinished"/> + <translation>Impossible de définir le statut de l'utilisateur. Vérifiez que vous êtes bien connecté au serveur.</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="160"/> @@ -5570,7 +5580,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="175"/> <source>Sync Logo</source> - <translation type="unfinished"/> + <translation>Logo de synchronisation</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="225"/> @@ -5824,7 +5834,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5867,23 +5877,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Compte connecté</translation> + <source>Current user status is online</source> + <translation>Le statut actuel de l'utilisateur est en ligne</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Compte non connecté</translation> + <source>Current user status is do not disturb</source> + <translation>Le statut actuel de l'utilisateur est ne pas déranger</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Le statut actuel de l'utilisateur est en ligne</translation> + <source>Account connected</source> + <translation>Compte connecté</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Le statut actuel de l'utilisateur est ne pas déranger</translation> + <source>Account not connected</source> + <translation>Compte non connecté</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5896,7 +5906,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Supprimer le compte</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Définir le statut</translation> </message> @@ -6087,7 +6097,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Suspendre toutes les synchronisations</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Définir le statut de l'utilisateur</translation> </message> @@ -6187,7 +6197,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ouvrir la fenêtre de partage</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6198,7 +6208,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Afficher plus d'actions</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 8c0b59bcd..2829e8392 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -1352,15 +1352,6 @@ Isto significa que o cliente de sincronización podería non enviar os cambios i %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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 ficheiros do cartafol de sincronización local «%1» foron eliminados. Estas eliminacións sincronizaranse co servidor, facendo que estes ficheiros non estean dispoñíbeis a non ser que se restauren. -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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1420,7 +1411,27 @@ Continuando a sincronización como normal fará que todos os seus ficheiros sexa <translation>Mantener os ficheiros locais en caso de conflito</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>Todos os ficheiros no cartafol de sincronización «%1» foron eliminados no servidor. +Estas eliminacións sincronizarse co seu cartafol de sincronización local, facendo que estes ficheiros non estean dispoñíbeis a menos que teña dereitos para restauralos. +Se decide restaurar os ficheiros, resincronizaranse co servidor se ten dereitos para facelo. +Se decide eliminar os ficheiros, non poderá dispor deles a non ser que sexa o propietario.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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 ficheiros do cartafol de sincronización local «%1» foron eliminados. Estas eliminacións sincronizaranse co servidor, facendo que estes ficheiros non estean dispoñíbeis a non ser que se restauren. +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="1255"/> <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. @@ -1428,7 +1439,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1445,17 +1456,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Retirar todos os ficheiros</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>Todos os ficheiros no cartafol de sincronización «%1» foron eliminados no servidor. -Estas eliminacións sincronizarse co seu cartafol de sincronización local, facendo que estes ficheiros non estean dispoñíbeis a menos que teña dereitos para restauralos. -Se decide restaurar os ficheiros, resincronizaranse co servidor se ten dereitos para facelo. -Se decide eliminar os ficheiros, non poderá dispor deles a non ser que sexa o propietario.</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>Conservar os ficheiros</translation> @@ -1502,7 +1502,7 @@ Se decide eliminar os ficheiros, non poderá dispor deles a non ser que sexa o p <translation>Atopouse un diario de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningunha aplicación.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2863,12 +2863,12 @@ actualización pode pedir privilexios adicionais durante o procedemento.</transl <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3366,14 +3366,24 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>ID do ficheiro</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> + <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="946"/> @@ -4180,7 +4190,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Non hai resultados para «%1»</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4795,16 +4805,16 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Os nomes de ficheiros que rematan cun punto non son compatíbeis con este sistema de ficheiros.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Non foi posíbel abrir ou crear a base de datos de sincronización local. Asegúrese de ter acceso de escritura no cartafol de sincronización.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <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/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Non foi posíbel abrir ou crear a base de datos de sincronización local. Asegúrese de ter acceso de escritura no cartafol de sincronización.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <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> @@ -4855,16 +4865,16 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Produciuse un fallo na obtención de estatísticas.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>O nome de ficheiro codificado non é correcto</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Non foi posíbel abrir o diario de sincronización</translation> @@ -4875,16 +4885,16 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Caracteres incorrectos, déalle outro nome a «%1»</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <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/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5824,7 +5834,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5867,23 +5877,23 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Conta conectada</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Conta sen conectar</translation> + <source>Current user status is do not disturb</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Conta conectada</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation type="unfinished"/> + <source>Account not connected</source> + <translation>Conta sen conectar</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5896,7 +5906,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Retirar a conta</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6087,7 +6097,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Por en pausa a sincronización para todos</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6187,7 +6197,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Abrir o diálogo de compartición</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6198,7 +6208,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Amosar máis accións</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_he.ts b/translations/client_he.ts index aa53cef84..cf7c606a6 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -1343,13 +1343,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1402,7 +1395,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>להשאיר את הקבצים המקומיים כסותרים</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1410,7 +1418,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1427,14 +1435,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>להסיר את כל הקבצים</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>לשמור על הקבצים</translation> @@ -1481,7 +1481,7 @@ 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/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2833,12 +2833,12 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3330,13 +3330,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4144,7 +4154,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>אין תוצאות לחיפוש אחר ‚%1’</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4759,16 +4769,16 @@ 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="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>שמות קבצים המכילים את התו ‚%1’ אינם נתמכים במערכת קבצים זו.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>שם הקובץ הוא שם שמור במערכת קבצים זו.</translation> @@ -4819,16 +4829,16 @@ 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="560"/> - <source>Unable to read from the sync journal.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="571"/> <source>Filename encoding is not valid</source> <translation>קידוד שם הקובץ שגוי</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="643"/> <source>Cannot open the sync journal</source> <translation type="unfinished"/> @@ -4839,16 +4849,16 @@ 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="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>שם הקובץ מכיל אות שגויה אחת לפחות</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>אין די מקום פנוי בכונן: הורדות שעלולות להוריד את הנפח הפנוי מתחת לסף של %1 ידולגו.</translation> @@ -5788,7 +5798,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5831,22 +5841,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>חשבון מחובר</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>חשבון מחובר</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5860,7 +5870,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6051,7 +6061,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6151,7 +6161,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6162,7 +6172,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_hr.ts b/translations/client_hr.ts index bbf58df35..82ac5d621 100644 --- a/translations/client_hr.ts +++ b/translations/client_hr.ts @@ -1352,15 +1352,6 @@ To znači da klijent za sinkronizaciju možda neće odmah otpremiti lokalne prom %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>Sve datoteke u vašoj lokalnoj mapi za sinkronizaciju „%1” su izbrisane. Ova će se brisanja sinkronizirati s vašim poslužiteljem, što znači da će te datoteke biti nedostupne ako ih ne vratite. -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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1420,7 +1411,27 @@ Nastavljanje sinkronizacije uzrokovat će zamjenu svih vaših datoteka starijim <translation>Zadrži lokalne datoteke kao datoteke nepodudaranja</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>Sve datoteke u mapi za sinkronizaciju „%1” izbrisane su s poslužitelja. +Ta će se brisanja sinkronizirati s lokalnom mapom za sinkronizaciju, što znači da će takve datoteke biti nedostupne ako nemate ovlasti za vraćanje. +Ako odlučite vratiti datoteke, ponovno će se sinkronizirati s poslužiteljem ako imate potrebne ovlasti. +Ako odlučite izbrisati datoteke, one će vam biti nedostupne ako niste njihov vlasnik.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>Sve datoteke u vašoj lokalnoj mapi za sinkronizaciju „%1” su izbrisane. Ova će se brisanja sinkronizirati s vašim poslužiteljem, što znači da će te datoteke biti nedostupne ako ih ne vratite. +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="1255"/> <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. @@ -1428,7 +1439,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1445,17 +1456,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Ukloni sve datoteke</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>Sve datoteke u mapi za sinkronizaciju „%1” izbrisane su s poslužitelja. -Ta će se brisanja sinkronizirati s lokalnom mapom za sinkronizaciju, što znači da će takve datoteke biti nedostupne ako nemate ovlasti za vraćanje. -Ako odlučite vratiti datoteke, ponovno će se sinkronizirati s poslužiteljem ako imate potrebne ovlasti. -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"/> <source>Keep files</source> <translation>Zadrži datoteke</translation> @@ -1502,7 +1502,7 @@ Ako odlučite izbrisati datoteke, one će vam biti nedostupne ako niste njihov v <translation>Pronađen je stari sinkronizacijski dnevnik ‘%1’ ali ga nije moguće ukloniti. Provjerite koristi li ga trenutno neka druga aplikacija.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2863,12 +2863,12 @@ dodatne ovlasti tijekom postupka.</translation> <translation>Virtualne datoteke nisu podržane za lokalne mape koje se upotrebljavaju kao korijenske mape particije sustava Windows. Odaberite važeću podmapu ispod slova diskovne particije.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3366,14 +3366,24 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>id datoteke</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> + <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="946"/> @@ -4180,7 +4190,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Nema rezultata za ‘%1’</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4795,16 +4805,16 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Nazivi datoteka koji završavaju točkom nisu podržani u ovom datotečnom sustavu.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Nije moguće otvoriti ili stvoriti lokalnu sinkronizacijsku bazu podataka. Provjerite imate li pristup pisanju u mapi za sinkronizaciju.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <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/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Nije moguće otvoriti ili stvoriti lokalnu sinkronizacijsku bazu podataka. Provjerite imate li pristup pisanju u mapi za sinkronizaciju.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <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> @@ -4855,16 +4865,16 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Stat nije uspio.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Nevažeće kodiranje naziva datoteke</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Nije moguće otvoriti sinkronizacijski dnevnik</translation> @@ -4875,16 +4885,16 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Nevažeći znakovi, preimenujte „%1”</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <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/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5824,7 +5834,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5867,23 +5877,23 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Račun povezan</translation> + <source>Current user status is online</source> + <translation>Trenutni status korisnika je „na mreži“</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Račun nije povezan</translation> + <source>Current user status is do not disturb</source> + <translation>Trenutni status korisnika je „ne ometaj“</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Trenutni status korisnika je „na mreži“</translation> + <source>Account connected</source> + <translation>Račun povezan</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Trenutni status korisnika je „ne ometaj“</translation> + <source>Account not connected</source> + <translation>Račun nije povezan</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5896,7 +5906,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Izbriši račun</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6087,7 +6097,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Pauziraj sinkronizaciju za sve</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6187,7 +6197,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Otvori dijaloški okvir za dijeljenje</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6198,7 +6208,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Prikaži dodatne radnje</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_hu.ts b/translations/client_hu.ts index 89f446356..2d35f613f 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -1352,15 +1352,6 @@ Ez azt jelenti, hogy a szinkronizációs kliens lehet, hogy nem fogja azonnal fe %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>A(z) „%1” helyi szinkronizálási mappában található összes fájl törölve lett. Ezek a törlések szinkronizálva lesznek a kiszolgálóval, így ezek nem lesznek elérhetők, amíg vissza nem állítják őket. -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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1420,7 +1411,27 @@ A szinkronizálás folytatásával az összes fájlja felül lesz írva egy rég <translation>Helyi fájlok megtartása ütközésként</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>A(z) „%1” szinkronizálási mappában lévő összes fájl törlésre került a kiszolgálóról. +Ezek a törlések szinkronizálva lesznek a helyi szinkronizálási mappával, így, hacsak nincs joga a helyreállításhoz, akkor ezek a fájlok nem lesznek elérhetők. +Ha úgy dönt, hogy helyreállítja a fájlokat, akkor azokat újra lesznek szinkronizálva a kiszolgálóval, ha erre jogosult. +Ha úgy dönt, hogy törli a fájlokat, akkor azok nem lesznek elérhetők Önnek, hacsak nem Ön a tulajdonos.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>A(z) „%1” helyi szinkronizálási mappában található összes fájl törölve lett. Ezek a törlések szinkronizálva lesznek a kiszolgálóval, így ezek nem lesznek elérhetők, amíg vissza nem állítják őket. +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="1255"/> <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. @@ -1431,7 +1442,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1450,17 +1461,6 @@ Ha ez véletlen volt, és úgy dönt, hogy megtartja ezeket a fájlokat, akkor <translation>Összes fájl eltávolítása</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>A(z) „%1” szinkronizálási mappában lévő összes fájl törlésre került a kiszolgálóról. -Ezek a törlések szinkronizálva lesznek a helyi szinkronizálási mappával, így, hacsak nincs joga a helyreállításhoz, akkor ezek a fájlok nem lesznek elérhetők. -Ha úgy dönt, hogy helyreállítja a fájlokat, akkor azokat újra lesznek szinkronizálva a kiszolgálóval, ha erre jogosult. -Ha úgy dönt, hogy törli a fájlokat, akkor azok nem lesznek elérhetők Önnek, hacsak nem Ön a tulajdonos.</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>Fájlok megtartása</translation> @@ -1507,7 +1507,7 @@ Ha úgy dönt, hogy törli a fájlokat, akkor azok nem lesznek elérhetők Önne <translation>Egy régi szinkronizálási naplófájl található: „%1”, de az nem törölhető. Győződjön meg róla, hogy jelenleg egy alkalmazás sem használja.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Egy régi szinkronizálási naplófájl található: „%1”, de az nem törölhető. Győződjön meg róla, hogy jelenleg egy alkalmazás sem használja.</translation> </message> @@ -2105,9 +2105,9 @@ Ha úgy dönt, hogy törli a fájlokat, akkor azok nem lesznek elérhetők Önne <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> - <translation>A frissítési csatorna határozza meg, hogy mely kliensfrissítéseket kínálják fel a telepítéshez. A "stabil" csatorna csak megbízhatónak tekintett frissítéseket tartalmaz, míg a "béta" csatorna verziói tartalmazhatnak újabb funkciókat és hibajavításokat, de még nem tesztelték őket alaposan. + <translation>A frissítési csatorna határozza meg, hogy mely kliensfrissítéseket kínálják fel a telepítéshez. A „stabil” csatorna csak megbízhatónak tekintett frissítéseket tartalmaz, míg a „béta” csatorna verziói tartalmazhatnak újabb funkciókat és hibajavításokat, de még nem tesztelték őket alaposan. -Ne feledje, hogy ez csak azt választja ki, hogy a frissítések milyen készletből származnak, és hogy nem lehetséges downgrade-elni: tehát a béta csatornáról a stabil csatornára való visszatérés általában nem azonnali, vagyis várni kell egy stabil verzióra, amely újabb, mint a jelenleg telepített béta változat.</translation> +Ne feledje, hogy ez csak azt választja ki, hogy a frissítések milyen készletből származnak, és hogy régebbi verzióra nem lehet visszaállni: tehát a béta csatornáról a stabil csatornára való visszatérés általában nem azonnali, vagyis várni kell egy stabil verzióra, amely újabb, mint a jelenleg telepített béta változat.</translation> </message> <message> <location filename="../src/gui/generalsettings.cpp" line="324"/> @@ -2394,21 +2394,21 @@ Ahol a törlés engedélyezett, ott az elemek törölve lesznek, ha megakadályo <source>The client can write debug logs to a temporary folder. These logs are very helpful for diagnosing problems. Since log files can get large, the client will start a new one for each sync run and compress older ones. It will also delete log files after a couple of hours to avoid consuming too much disk space. If enabled, logs will be written to %1</source> - <translation>Az ügyfél írhat hibakeresési naplókat egy ideiglenes mappába. Ezek a naplók nagyon hasznosak a problémák diagnosztizálásában. -Mivel a naplófájlok nagyok lehetnek, az ügyfél minden szinkronizálási futtatáshoz újat indít és tömöríti a régebbi fájlokat. Néhány nap elteltével törli a naplófájlokat, hogy ne foglaljon túl sok lemezterület. -Ha engedélyezve van, akkor a naplókat a(z) %1 könyvtárba kerülnek.</translation> + <translation>A kliens hibakeresési naplókat írhat egy ideiglenes mappába. Ezek a naplók nagyon hasznosak a problémák diagnosztizálásában. +Mivel a naplófájlok nagyok lehetnek, ezért a kliens minden szinkronizálási futtatáshoz újat indít és tömöríti a régebbi fájlokat. Néhány nap elteltével törli a naplófájlokat, hogy ne foglaljon túl sok lemezterület. +Ha engedélyezve van, akkor a naplók a(z) %1 könyvtárba kerülnek.</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="64"/> <source>Enable logging to temporary folder</source> - <translation>Az ideiglenes mappába történő naplózás engedélyezése</translation> + <translation>Ideiglenes mappába történő naplózás engedélyezése</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="70"/> <source>This setting persists across client restarts. Note that using any logging command line options will override this setting.</source> - <translation>Ez a beállítás az ügyfél újraindításakor is fennmarad. -Ne feledje, hogy a naplózás parancssori opcióinak használata felülbírálja ezt a beállítást.</translation> + <translation>Ez a beállítás a kliens újraindításakor is megmarad. +Ne feledje, hogy a naplózás parancssori kapcsolóinak használata felülbírálja ezt a beállítást.</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="70"/> @@ -2535,7 +2535,7 @@ A naplók ide lesznek írva: %1</translation> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="455"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> - <translation><p> A(z) %1 ügyfél új verziója elérhető, de a frissítési folyamat sikertelen volt.</p><p><b>%2</b> letöltve. A telepített verzió: %3.</p></translation> + <translation><p> A %1 kliens új verziója érhető el, de a frissítési folyamat sikertelen volt.</p><p><b>%2</b> lett letöltve. A telepített verzió: %3.</p></translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> @@ -2750,12 +2750,12 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="153"/> <source>Downloading %1. Please wait …</source> - <translation>%1 letöltése. Kérjük várjon …</translation> + <translation>%1 letöltése. Kis türelmet…</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="155"/> <source>%1 available. Restart application to start the update.</source> - <translation>% 1 elérhető. A frissítés elindításához indítsa újra az alkalmazást.</translation> + <translation>%1 elérhető. A frissítés elindításához indítsa újra az alkalmazást.</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> @@ -2785,7 +2785,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="161"/> <source>New %1 is available. Please open %2 to download the update.</source> - <translation>Új %1 elérhető. A frissítés letöltéséhez kattintson ide: %2</translation> + <translation>Új %1 elérhető. A frissítés letöltéséhez nyissa meg ezt: %2</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> @@ -2823,7 +2823,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="60"/> <source>Connect</source> - <translation>Csatlakozás</translation> + <translation>Kapcsolódás</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="54"/> @@ -2834,7 +2834,7 @@ for additional privileges during the process.</source> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="225"/> <source>Use &virtual files instead of downloading content immediately %1</source> - <translation>Használjon &virtuális fájlokat a tartalom azonnali letöltése helyett %1</translation> + <translation>&Virtuális fájlok használata a tartalom azonnali letöltése helyett %1</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> @@ -2868,12 +2868,12 @@ for additional privileges during the process.</source> <translation>A virtuális fájlok nem támogatottak a windowsos partíciók gyökerében helyi mappaként. Válasszon érvényes almappát a meghajtó betűjele alatt.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>A(z) „%2” %1 mappa szinkronizálva van a(z) „%3” helyi mappába</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>A(z) „%1” mappa szinkronizálása</translation> </message> @@ -2891,7 +2891,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="359"/> <source>Virtual files are not available for the selected folder</source> - <translation>Virtuális fájlok nem érhetők el a kiválasztott mappához</translation> + <translation>A virtuális fájlok nem érhetők el a kiválasztott mappához</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="419"/> @@ -3005,7 +3005,7 @@ for additional privileges during the process.</source> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="86"/> <source>The link to your %1 web interface when you open it in the browser.</source> <comment>%1 will be replaced with the application name</comment> - <translation>A %1 webes felületre mutató link, amikor megnyitja a böngészőben.</translation> + <translation>A %1 webes felületére mutató hivatkozás, amikor megnyitja a böngészőben.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="80"/> @@ -3020,7 +3020,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="96"/> <source>This is the link to your %1 web interface when you open it in the browser.<br/>It looks like https://cloud.example.com or https://example.com/cloud</source> - <translation>Ez a link a(z) %1 webes felületére, amikor a böngészőben megnyitja. <br/> Úgy néz ki, mint https://cloud.example.com vagy https://example.com/cloud</translation> + <translation>Ez a hivatkozás a %1 webes felületére, amikor a böngészőben megnyitja. <br/> Úgy néz ki, mint a https://cloud.example.com vagy a https://example.com/cloud</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="185"/> @@ -3220,7 +3220,7 @@ Használata nem ajánlott.</translation> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="96"/> <source>Add %1 account</source> - <translation>%1 fiók hozzáadása</translation> + <translation>%1-fiók hozzáadása</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="91"/> @@ -3246,18 +3246,18 @@ The virtual files mode is mutually exclusive with selective sync. Currently unse Switching to this mode will abort any currently running synchronization. This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source> - <translation>Ha a "virtuális fájl" mód engedélyezve van, akkor eredetileg egyetlen fájl sem kerül letöltésre. Ehelyett egy apró "%1" fájl jön létre a szerveren létező minden fájlhoz. A tartalom letölthető a fájlok futtatásával vagy a helyi menü használatával. + <translation>Ha a „virtuális fájl” mód engedélyezve van, akkor kezdetben egyetlen fájl sem kerül letöltésre. Ehelyett egy apró „%1” fájl jön létre a kiszolgálón létező összes fájlhoz. A tartalmuk a fájlok futtatásával vagy a helyi menü használatával tölthető el. -A virtuális fájl mód és a szelektív szinkronizálás kölcsönösen kizárja egymást. Az aktuálisan ki nem kijelölt mappák csak online mappák lesznek, és a szelektív szinkronizálási beállítások visszaállnak alapállapotba. +A virtuális fájl mód és a szelektív szinkronizálás kölcsönösen kizárják egymást. A jelenleg ki nem kijelölt mappák csak online mappák lesznek, és a szelektív szinkronizálási beállítások visszaállnak alapállapotba. Erre az üzemmódra váltás megszakítja a jelenleg futó szinkronizálást. -Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, kérjük, jelezze a felmerülő problémákat.</translation> +Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nekünk a felmerülő problémákat.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="435"/> <source>Enable experimental placeholder mode</source> - <translation>Engedélyezze a kísérleti helyőrző módot</translation> + <translation>Kísérleti helykitöltő mód engedélyezése</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="436"/> @@ -3278,17 +3278,17 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, kérjük, jelezze <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 szerveren. </translation> + <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ű fájl már létezik a helyi számítógépen. </translation> + <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="250"/> <source>Symbolic links are not supported in syncing.</source> - <translation>A szimbolikus hivatkozások nem támogatottak a szinkronizálás során.</translation> + <translation>A szimbolikus linkek nem támogatottak a szinkronizálás során.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="258"/> @@ -3298,7 +3298,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, kérjük, jelezze <message> <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File names ending with a period are not supported on this file system.</source> - <translation>Pontokkal végződő fájlneveket ez a fájlrendszer nem támogat.</translation> + <translation>A pontokkal végződő fájlneveket ez a fájlrendszer nem támogatja.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="272"/> @@ -3371,14 +3371,24 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, kérjük, jelezze <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="490"/> + <source>permission</source> + <translation>jogosultság</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>fájlazonosító</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> + <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="946"/> @@ -4185,7 +4195,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, kérjük, jelezze <translation>Nincs találat erre: „%1”</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>Nincs találat erre: „%1”</translation> </message> @@ -4800,16 +4810,16 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, kérjük, jelezze <translation>A ponttal végződő fájlnevek nem támogatottak ezen a fájlrendszeren.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>A helyi szinkronizálási adatbázis nem nyitható meg, vagy nem hozható létre. Győződjön meg róla, hogy rendelkezik-e írási joggal a szinkronizálási mappán.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <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/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>A helyi szinkronizálási adatbázis nem nyitható meg, vagy nem hozható létre. Győződjön meg róla, hogy rendelkezik-e írási joggal a szinkronizálási mappán.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>A fájlnév a rendszer számára fenntartott ezen a fájlrendszeren.</translation> @@ -4860,16 +4870,16 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, kérjük, jelezze <translation>Statisztika sikertelen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>A fájlnév kódolása érvénytelen</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>A szinkronizálási napló nem nyitható meg</translation> @@ -4880,16 +4890,16 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, kérjük, jelezze <translation>Érvénytelen karakterek, nevezze át: „%1”</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <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="1110"/> <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/syncengine.cpp" line="1056"/> + <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="1045"/> <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> @@ -5829,7 +5839,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, kérjük, jelezze <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation>Fájlok, üzenetek, események keresése…</translation> </message> @@ -5872,23 +5882,23 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, kérjük, jelezze </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Fiók csatlakoztatva</translation> + <source>Current user status is online</source> + <translation>Jelenlegi felhasználói állapot: online</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>A fiók nincs összekapcsolva</translation> + <source>Current user status is do not disturb</source> + <translation>Jelenlegi felhasználói állapot: ne zavarjanak</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Jelenlegi felhasználói állapot: online</translation> + <source>Account connected</source> + <translation>Fiók csatlakoztatva</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Jelenlegi felhasználói állapot: ne zavarjanak</translation> + <source>Account not connected</source> + <translation>A fiók nincs összekapcsolva</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5901,7 +5911,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, kérjük, jelezze <translation>Fiók törlése</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Állapot beállítása</translation> </message> @@ -6092,7 +6102,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, kérjük, jelezze <translation>Szinkronizálás szüneteltetése mindenkinek</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Felhasználó állapotának beállítása</translation> </message> @@ -6192,7 +6202,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, kérjük, jelezze <translation>Megosztási párbeszédpanel megnyitása</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation>Egyesített keresési találatlista</translation> </message> @@ -6203,7 +6213,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, kérjük, jelezze <translation>További műveletek megjelenítése</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation>%1 – Fájl tevékenység</translation> </message> diff --git a/translations/client_id.ts b/translations/client_id.ts index 42493c11b..b48239b82 100644 --- a/translations/client_id.ts +++ b/translations/client_id.ts @@ -1344,13 +1344,6 @@ Ini artinya sinkronisasi klien mungkin tidak menggunggah perubahan lokal seseger %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1405,7 +1398,22 @@ Melanjutkan sinkronisasi seperti biasanya akan menyebabkan semua berkas Anda dit <translation>Buat Berkas Lokal sebagai Konflik</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1413,7 +1421,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1430,14 +1438,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1484,7 +1484,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Sebuah jurnal sinkronisasi lama '%1' telah ditemukan, namun tidak dapat menghapusnya. Mohon untuk memastikan bahwa tida ada aplikasi yang sedang menggunakannya.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2837,12 +2837,12 @@ beberapa ijin pada saat proses berjalan.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3333,13 +3333,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4147,7 +4157,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/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4760,13 +4770,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/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <location filename="../src/libsync/syncengine.cpp" line="507"/> + <source>File names containing the character '%1' are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="507"/> - <source>File names containing the character '%1' are not supported on this file system.</source> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation type="unfinished"/> </message> <message> @@ -4820,13 +4830,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/libsync/syncengine.cpp" line="560"/> - <source>Unable to read from the sync journal.</source> + <location filename="../src/libsync/syncengine.cpp" line="571"/> + <source>Filename encoding is not valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> - <source>Filename encoding is not valid</source> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> <translation type="unfinished"/> </message> <message> @@ -4840,13 +4850,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/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> + <location filename="../src/libsync/syncengine.cpp" line="1110"/> + <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1110"/> - <source>File name contains at least one invalid character</source> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> @@ -5789,7 +5799,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5832,22 +5842,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Akun terhubung</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Akun terhubung</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5861,7 +5871,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6052,7 +6062,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6152,7 +6162,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6163,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_is.ts b/translations/client_is.ts index 7b7f58f62..7330fc33d 100644 --- a/translations/client_is.ts +++ b/translations/client_is.ts @@ -1348,13 +1348,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1407,7 +1400,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Halda skrám á tölvunni við árekstra</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1415,7 +1423,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1432,14 +1440,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1487,7 +1487,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2838,12 +2838,12 @@ aðgerð til að leysa málið!</small></p></translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3337,13 +3337,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4152,7 +4162,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Engar niðurstöður fyrir '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4767,16 +4777,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Skráarheiti sem enda á punkti eru ekki nothæf á þessu skráakerfi.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Mistókst að opna eða búa til atvikaskrána. Gakktu úr skugga um að þú hafir les- og skrifheimildir í staðværu samstillingarmöppunni á tölvunni.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Skráarheiti sem innihalda stafinn '%1' eru ekki nothæf á þessu skráakerfi.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Mistókst að opna eða búa til atvikaskrána. Gakktu úr skugga um að þú hafir les- og skrifheimildir í staðværu samstillingarmöppunni á tölvunni.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>Skráarheitið er frátekið fyrir annað í þessu skráakerfi.</translation> @@ -4827,16 +4837,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Mistókst að keyra stat.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Stafatafla skráarheitis er ekki gild</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Tekst ekki að opna atvikaskrá samstillingar</translation> @@ -4847,16 +4857,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ógildir stafir, endurnefndu "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>Skráarheitið inniheldur að minnsta kosti einn ógildan staf</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> @@ -5797,7 +5807,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5840,22 +5850,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Aðgangur er tengdur</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Aðgangur er tengdur</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5869,7 +5879,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Fjarlægja aðgang</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6060,7 +6070,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Gera hlé á samstillingu fyrir allt</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6160,7 +6170,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Opna deilingarglugga</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6171,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_it.ts b/translations/client_it.ts index cc94d2103..945cee4ef 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -1353,15 +1353,6 @@ Questo significa che il client di sincronizzazione potrebbe non caricare le modi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>Tutti i file nella cartella locale di sincronizzazione '%1' sono stati eliminati. Queste eliminazioni saranno sincronizzate con il tuo server, rendendo tali file indisponibili, a meno di un ripristino. -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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1421,7 +1412,27 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut <translation>Mantieni i file locali come conflitto</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>Tutti i file nella cartella di sincronizzazione '%1' sono stati eliminati sul server. +Queste eliminazioni saranno sincronizzate con la tua cartella locale, rendendo tali file indisponibili, a meno che tu abbia il permesso per ripristinarli. +Se decidi di ripristinare i file, essi saranno sincronizzati nuovamente con il server, se hai i diritti per farlo. +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="1260"/> + <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>Tutti i file nella cartella locale di sincronizzazione '%1' sono stati eliminati. Queste eliminazioni saranno sincronizzate con il tuo server, rendendo tali file indisponibili, a meno di un ripristino. +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="1255"/> <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. @@ -1432,7 +1443,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1451,17 +1462,6 @@ Se è stato un errore e decidi di tenere i file, saranno sincronizzati nuovament <translation>Rimuovi tutti i file</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>Tutti i file nella cartella di sincronizzazione '%1' sono stati eliminati sul server. -Queste eliminazioni saranno sincronizzate con la tua cartella locale, rendendo tali file indisponibili, a meno che tu abbia il permesso per ripristinarli. -Se decidi di ripristinare i file, essi saranno sincronizzati nuovamente con il server, se hai i diritti per farlo. -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"/> <source>Keep files</source> <translation>Mantieni i file</translation> @@ -1508,7 +1508,7 @@ Se decidi di eliminare i file, non saranno più disponibili, a meno che tu sia i <translation>È stato trovato un vecchio registro di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>È stato trovato un vecchio registro di sincronizzazione "%1", ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation> </message> @@ -2864,12 +2864,12 @@ for additional privileges during the process.</source> <translation>I file virtuali non sono supportati per le radici delle partizioni di Windows come cartelle locali. Scegli una sottocartella valida sotto la lettera del disco.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>La cartella "%2" di %1 è sincronizzata con la cartella locale "%3"</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>Sincronizza la cartella "%1"</translation> </message> @@ -3361,14 +3361,24 @@ 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="490"/> + <source>permission</source> + <translation>permesso</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>ID del file</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> + <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="946"/> @@ -4175,7 +4185,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nessun risultato per '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>Nessun risultato per "%1"</translation> </message> @@ -4790,16 +4800,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>I nomi del file che terminano con un punto non sono supportati su questo file system.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Impossibile aprire o creare il database locale di sincronizzazione. Assicurati di avere accesso in scrittura alla cartella di sincronizzazione.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <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/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Impossibile aprire o creare il database locale di sincronizzazione. Assicurati di avere accesso in scrittura alla cartella di sincronizzazione.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <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> @@ -4850,16 +4860,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stat non riuscita.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>La codifica del nome del file non è valida</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Impossibile aprire il registro di sincronizzazione</translation> @@ -4870,16 +4880,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Caratteri non validi, rinomina "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation>La sincronizzazione riprenderà a breve.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <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/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation>La sincronizzazione riprenderà a breve.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5819,7 +5829,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation>Cerca file, messaggi, eventi …</translation> </message> @@ -5862,23 +5872,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Account connesso</translation> + <source>Current user status is online</source> + <translation>Lo stato attuale dell'utente è in linea</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Account non connesso</translation> + <source>Current user status is do not disturb</source> + <translation>Lo stato attuale dell'utente è non disturbare</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Lo stato attuale dell'utente è in linea</translation> + <source>Account connected</source> + <translation>Account connesso</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Lo stato attuale dell'utente è non disturbare</translation> + <source>Account not connected</source> + <translation>Account non connesso</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5891,7 +5901,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Rimuovi account</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Imposta stato</translation> </message> @@ -6082,7 +6092,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Sospendi la sincronizzazione per tutto</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Imposta lo stato utente</translation> </message> @@ -6182,7 +6192,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Apri finestra di condivisione</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation>Lista unificata dei risultati di ricerca</translation> </message> @@ -6193,7 +6203,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Mostra altre azioni</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation>%1 - Attività file</translation> </message> diff --git a/translations/client_ja.ts b/translations/client_ja.ts index c82aab9a6..562824cbd 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -1352,15 +1352,6 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>ローカル同期フォルダー '%1'内のすべてのファイルが削除されました。この削除はサーバーに同期され、復元されない限りそのファイルは使用できなくなります。 -このアクションをサーバーと同期してもよろしいですか？ -これが操作ミスであり、ファイルを維持することにした場合、ファイルはサーバーから再同期されます。</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1052"/> <source>All files in the sync folder '%1' 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. @@ -1418,7 +1409,27 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>コンフリクト時にローカルファイルを保持</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>同期フォルダー '%1'フォルダー内のすべてのファイルがサーバー上で削除されました。 +これらの削除はローカル同期フォルダーと同期され、復元する権限がない限り、ファイルは使用できなくなります。 +ファイルを復元したい場合、権限があればサーバーと再同期されます。 +ファイルを削除することにした場合、所有者でない限り、ファイルは利用できなくなります。</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>ローカル同期フォルダー '%1'内のすべてのファイルが削除されました。この削除はサーバーに同期され、復元されない限りそのファイルは使用できなくなります。 +このアクションをサーバーと同期してもよろしいですか？ +これが操作ミスであり、ファイルを維持することにした場合、ファイルはサーバーから再同期されます。</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1255"/> <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. @@ -1429,7 +1440,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1448,17 +1459,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>すべてのファイルを削除</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>同期フォルダー '%1'フォルダー内のすべてのファイルがサーバー上で削除されました。 -これらの削除はローカル同期フォルダーと同期され、復元する権限がない限り、ファイルは使用できなくなります。 -ファイルを復元したい場合、権限があればサーバーと再同期されます。 -ファイルを削除することにした場合、所有者でない限り、ファイルは利用できなくなります。</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>ファイルを保持</translation> @@ -1505,7 +1505,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>古い同期ジャーナル '%1' が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>古い同期ジャーナル "%1" が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation> </message> @@ -2864,12 +2864,12 @@ for additional privileges during the process.</source> <translation>仮想ファイルは、ローカルフォルダーのWindowsルートパーティションではサポートされていません。ドライブレターの下の有効なサブフォルダを選択してください。</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>%1 のフォルダー "%2" はローカルフォルダー "%3" と同期しています</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>"%1" フォルダーを同期</translation> </message> @@ -3367,14 +3367,24 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>ファイルID</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>サーバーから no %1 と通知がありました</translation> + <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="946"/> @@ -4181,7 +4191,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>'%1' は見つかりませんでした</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>"%1" は見つかりませんでした</translation> </message> @@ -4796,16 +4806,16 @@ 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="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>ローカル同期データベースを開いたり作成できません。 同期フォルダーに書き込み権限があることを確認してください。</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>ファイル名に使用できない文字列が含まれています: '%1'</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>ローカル同期データベースを開いたり作成できません。 同期フォルダーに書き込み権限があることを確認してください。</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>ファイル名はこのファイルシステムで予約されている名前です。</translation> @@ -4856,16 +4866,16 @@ 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="560"/> - <source>Unable to read from the sync journal.</source> - <translation>同期ジャーナルから読み込みできません</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="571"/> <source>Filename encoding is not valid</source> <translation>ファイル名のエンコーディングが無効です。</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> + <translation>同期ジャーナルから読み込みできません</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="643"/> <source>Cannot open the sync journal</source> <translation>同期ジャーナルを開くことができません</translation> @@ -4876,16 +4886,16 @@ 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="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>ファイル名に1文字以上の無効な文字が含まれています</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>ディスク容量が少ない：%1以下の空き容量を減らすダウンロードはスキップされました。</translation> @@ -5825,7 +5835,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5868,23 +5878,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>アカウント接続済</translation> + <source>Current user status is online</source> + <translation>現在のユーザーステータスはオンラインです</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>アカウントは接続していません</translation> + <source>Current user status is do not disturb</source> + <translation>現在のユーザーステータスは取り込み中です</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>現在のユーザーステータスはオンラインです</translation> + <source>Account connected</source> + <translation>アカウント接続済</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>現在のユーザーステータスは取り込み中です</translation> + <source>Account not connected</source> + <translation>アカウントは接続していません</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5897,7 +5907,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>ステータスを設定</translation> </message> @@ -6088,7 +6098,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>ステータスを設定</translation> </message> @@ -6188,7 +6198,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6199,7 +6209,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation>%1 - ファイルアクティビティ</translation> </message> diff --git a/translations/client_ko.ts b/translations/client_ko.ts index 04a200ccb..78c4eb3f0 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -1352,15 +1352,6 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>동기화 폴더 '%1'의 모든 파일이 삭제되었습니다. 이 삭제는 서버와 동기화되므로 해당 파일을 복원하지 않는 한 사용할 수 없습니다. -이 동작을 서버와 동기화하시겠습니까? -이 동작이 우연이고 파일을 유지하고자 할 경우, 서버로부터 재동기화 될 것입니다.</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1052"/> <source>All files in the sync folder '%1' 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. @@ -1420,7 +1411,27 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>로컬 파일을 충돌 상태로 유지</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>동기화 폴더 '%1'의 모든 파일이 서버에서 삭제되었습니다. +이러한 삭제는 로컬 동기화 폴더와 동기화되므로 복원할 권한이 없으면 해당 파일을 사용할 수 없습니다. +파일을 복원하기로 결정한 경우, 파일을 복원할 수 있는 권한이 있으면 파일이 서버와 다시 동기화됩니다. +파일을 삭제하기로 결정한 경우 소유자가 아닌 한 해당 파일을 사용할 수 없습니다.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>동기화 폴더 '%1'의 모든 파일이 삭제되었습니다. 이 삭제는 서버와 동기화되므로 해당 파일을 복원하지 않는 한 사용할 수 없습니다. +이 동작을 서버와 동기화하시겠습니까? +이 동작이 우연이고 파일을 유지하고자 할 경우, 서버로부터 재동기화 될 것입니다.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1255"/> <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. @@ -1428,7 +1439,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1445,17 +1456,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>모두 삭제</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>동기화 폴더 '%1'의 모든 파일이 서버에서 삭제되었습니다. -이러한 삭제는 로컬 동기화 폴더와 동기화되므로 복원할 권한이 없으면 해당 파일을 사용할 수 없습니다. -파일을 복원하기로 결정한 경우, 파일을 복원할 수 있는 권한이 있으면 파일이 서버와 다시 동기화됩니다. -파일을 삭제하기로 결정한 경우 소유자가 아닌 한 해당 파일을 사용할 수 없습니다.</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>파일 유지</translation> @@ -1502,7 +1502,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>오래된 동기화 저널 '%1'을 찾았지만 제거 할 수 없습니다. 현재 사용중인 응용 프로그램이 없는지 확인하십시오.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2867,12 +2867,12 @@ for additional privileges during the process.</source> 드라이브 문자가 지정된 유효한 하위 폴더를 선택하십시오.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3370,14 +3370,24 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>파일 id</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>서버가 %1이(가) 없다고(아니라고) 보고함</translation> + <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="946"/> @@ -4184,7 +4194,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>'%1'에 대한 결과 없음</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4799,16 +4809,16 @@ 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="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>로컬 동기화 데이터베이스를 열거나 만들 수 없습니다. 동기화 폴더에 대한 쓰기 권한이 있는지 확인하십시오.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>'%1'을 포함하는 파일 이름은 이 파일 시스템에서 지원되지 않습니다.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>로컬 동기화 데이터베이스를 열거나 만들 수 없습니다. 동기화 폴더에 대한 쓰기 권한이 있는지 확인하십시오.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>해당 파일 이름은 이 파일 시스템에서 예약된 이름입니다.</translation> @@ -4859,16 +4869,16 @@ 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="560"/> - <source>Unable to read from the sync journal.</source> - <translation>동기화 저널에서 읽을 수 없습니다.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="571"/> <source>Filename encoding is not valid</source> <translation>파일 이름 인코딩이 올바르지 않습니다.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> + <translation>동기화 저널에서 읽을 수 없습니다.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="643"/> <source>Cannot open the sync journal</source> <translation>동기화 저널을 열 수 없습니다.</translation> @@ -4879,16 +4889,16 @@ 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="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>파일 이름에 유효하지 않은 문자가 하나 이상 있습니다.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>디스크 공간이 부족합니다. 여유 공간이 %1 미만으로 남으면 다운로드를 건너 뜁니다.</translation> @@ -5828,7 +5838,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5871,23 +5881,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>계정 연결됨</translation> + <source>Current user status is online</source> + <translation>현재 사용자 상태가 오프라인임</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>계정이 연결되지 않음</translation> + <source>Current user status is do not disturb</source> + <translation>현재 사용자 상태가 방해 금지임</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>현재 사용자 상태가 오프라인임</translation> + <source>Account connected</source> + <translation>계정 연결됨</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>현재 사용자 상태가 방해 금지임</translation> + <source>Account not connected</source> + <translation>계정이 연결되지 않음</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5900,7 +5910,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6091,7 +6101,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6191,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6202,7 +6212,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts index b45c313e4..cacbfd70b 100644 --- a/translations/client_lt_LT.ts +++ b/translations/client_lt_LT.ts @@ -1343,13 +1343,6 @@ This means that the synchronization client might not upload local changes immedi Tai reiškia, kad sinchronizacijos klientas gali iš karto neįkelti lokalių pakeitimų, o tik juos nuskaityti. Įkėlimas bus atliekamas tam tikrais laiko tarpais (pagal numatytuosius nustatymus kas dvi valandas).</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1408,7 +1401,22 @@ Jei tęsite sinchronizavimą, Jūsų ankstesni failai bus perrašyti senesniais. <translation>Laikyti vietinius failus kaip konfliktinius</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1416,7 +1424,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1433,14 +1441,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Šalinti visus failus</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>Palikti failus</translation> @@ -1487,7 +1487,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Senas sinchronizavimo žurnalas '% 1' buvo surastas, tačiau jo nepavyko pašalinti. Įsitikinkite, kad šiuo metu jo nenaudoja jokia programa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2845,12 +2845,12 @@ papildomų teisių.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3342,13 +3342,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>failo id</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4156,7 +4166,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>„%1“ negrąžino jokių rezultatų</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4771,16 +4781,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Failo pavadinimai, kurie baigiasi tašku šioje failų sistemoje nepalaikomi.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Nepavyko atverti ar sukurti sinchronizavimo duomenų bazės kompiuteryje. Įsitikinkite, kad į sinchronizavimo aplanką galite rašyti.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Failo pavadinime esantis simbolis „%1“ nepalaikomas šioje failų sistemoje.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Nepavyko atverti ar sukurti sinchronizavimo duomenų bazės kompiuteryje. Įsitikinkite, kad į sinchronizavimo aplanką galite rašyti.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>Šis failo pavadinimas šioje failų sistemoje yra rezervuotas.</translation> @@ -4831,16 +4841,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Statistika nesėkminga.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <source>Unable to read from the sync journal.</source> - <translation>Nepavyko perskaityti sinchronizavimo žurnalo.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="571"/> <source>Filename encoding is not valid</source> <translation>Failo kodavimas neteisingas</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> + <translation>Nepavyko perskaityti sinchronizavimo žurnalo.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="643"/> <source>Cannot open the sync journal</source> <translation>Nepavyksta atverti sinchronizavimo žurnalo</translation> @@ -4851,16 +4861,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Neteisingi simboliai, pervadinkite "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>Failo pavadinime yra bent vienas neleistinas simbolis</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5800,7 +5810,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5843,23 +5853,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Paskyra prijungta</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Paskyra neprijungta</translation> + <source>Current user status is do not disturb</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Paskyra prijungta</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation type="unfinished"/> + <source>Account not connected</source> + <translation>Paskyra neprijungta</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5872,7 +5882,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Šalinti paskyrą</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6063,7 +6073,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6163,7 +6173,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Atverti bendrinimo dialogą</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6174,7 +6184,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Rodyti daugiau veiksmų</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_lv.ts b/translations/client_lv.ts index dcf3d6ea2..4c4a3ab12 100644 --- a/translations/client_lv.ts +++ b/translations/client_lv.ts @@ -1340,13 +1340,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1399,7 +1392,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Saglabāt lokālās datnes kā konfliktu</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1407,7 +1415,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1424,14 +1432,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1478,7 +1478,7 @@ 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/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2827,12 +2827,12 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3323,13 +3323,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4137,7 +4147,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/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4750,13 +4760,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/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <location filename="../src/libsync/syncengine.cpp" line="507"/> + <source>File names containing the character '%1' are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="507"/> - <source>File names containing the character '%1' are not supported on this file system.</source> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation type="unfinished"/> </message> <message> @@ -4810,13 +4820,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/libsync/syncengine.cpp" line="560"/> - <source>Unable to read from the sync journal.</source> + <location filename="../src/libsync/syncengine.cpp" line="571"/> + <source>Filename encoding is not valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> - <source>Filename encoding is not valid</source> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> <translation type="unfinished"/> </message> <message> @@ -4830,13 +4840,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/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> + <location filename="../src/libsync/syncengine.cpp" line="1110"/> + <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1110"/> - <source>File name contains at least one invalid character</source> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> @@ -5779,7 +5789,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5822,22 +5832,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> + <source>Current user status is online</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> + <source>Account connected</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5851,7 +5861,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6042,7 +6052,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6142,7 +6152,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6153,7 +6163,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_mk.ts b/translations/client_mk.ts index 0b361350b..60ad8f132 100644 --- a/translations/client_mk.ts +++ b/translations/client_mk.ts @@ -1342,13 +1342,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1401,7 +1394,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Зачувај ги локалните датотеки како конфликтни</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1409,7 +1417,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1426,14 +1434,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Отстрани ги сите датотеки</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>Задржи ги датотеките</translation> @@ -1480,7 +1480,7 @@ 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/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2835,12 +2835,12 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3332,13 +3332,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>id на датотека</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4146,7 +4156,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Нема резултати за '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4761,16 +4771,16 @@ 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="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Имиња на датотеки кој го содржат карактерот '%1' не се поддржани на овој систем.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>Ова име на датотека е резервирано име на системот.</translation> @@ -4821,13 +4831,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/libsync/syncengine.cpp" line="560"/> - <source>Unable to read from the sync journal.</source> + <location filename="../src/libsync/syncengine.cpp" line="571"/> + <source>Filename encoding is not valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> - <source>Filename encoding is not valid</source> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> <translation type="unfinished"/> </message> <message> @@ -4841,16 +4851,16 @@ 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="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>Името на датотеката соджи невалиден карактер</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Има малку простор на дискот: Преземањата ќе доведат да просторот на дискот се намали под %1 поради тоа се прескокнува.</translation> @@ -5790,7 +5800,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5833,23 +5843,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Сметката е поврзана</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Сметката не е поврзана</translation> + <source>Current user status is do not disturb</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Сметката е поврзана</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation type="unfinished"/> + <source>Account not connected</source> + <translation>Сметката не е поврзана</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5862,7 +5872,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6053,7 +6063,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6153,7 +6163,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6164,7 +6174,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index 8d58a9001..20a5ca5fb 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -1341,13 +1341,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1402,7 +1395,22 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev <translation>Behold lokale filer som konflikt</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1410,7 +1418,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1427,14 +1435,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1481,7 +1481,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>En gammel synkroniseringsjournal '%1' ble funnet men kunne ikke fjernes. Pass på at ingen applikasjoner bruker den.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2833,12 +2833,12 @@ kan be om flere rettigheter under behandlingen.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3329,13 +3329,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4143,7 +4153,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ingen resultater for '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4758,16 +4768,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Filnavn som slutter med punktum er ikke tillatt på dette filsystemet</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Filnavn som inneholder '%1' er ikke tillatt på dette filsystemet</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>Filnavnet er et reservert navn på dette filsystemet.</translation> @@ -4818,16 +4828,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stat feilet.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Filnavn-koding er ikke gyldig</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Kan ikke åpne synkroniseringsjournalen</translation> @@ -4838,16 +4848,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ugyldige tegn, gi et annet navn til "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>Filnavnet inneholder minst ett ulovlig tegn</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> @@ -5787,7 +5797,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5830,22 +5840,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Konto er koblet</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Konto er koblet</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5859,7 +5869,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6050,7 +6060,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6150,7 +6160,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6161,7 +6171,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index c9a243542..eae0e77c2 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -1351,14 +1351,6 @@ Dit betekent dat de synchronisatieclient misschien niet meteen lokale wijziginge %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>Alle bestanden in je lokale syncmap '%1' werden verwijderd. Deze verwijderingen worden gesynchroniseerd naar je server, waardoor de bestanden niet beschikbaar zijn, tenzij ze worden teruggezet. Weet je zeker dat je deze acties wilt synchroniseren met de server? -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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1418,7 +1410,26 @@ Doorgaan met deze synchronisatie overschrijft al je bestanden door een eerdere v <translation>Behoud lokale bestanden als conflict</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>Alle bestanden in de syncmap '%1' map werden verwijderd van de server. +Deze verwijderingen worden gesynchroniseerd naar je lokale syncmap, waardoor deze bestanden niet meer beschikbaar zijn, tenzij je het recht hebt om ze te herstellen. +Als je de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de server als je die autorisatie hebt. +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="1260"/> + <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>Alle bestanden in je lokale syncmap '%1' werden verwijderd. Deze verwijderingen worden gesynchroniseerd naar je server, waardoor de bestanden niet beschikbaar zijn, tenzij ze worden teruggezet. Weet je zeker dat je deze acties wilt synchroniseren met de server? +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="1255"/> <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. @@ -1429,7 +1440,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1447,17 +1458,6 @@ Als dit een ongelukje was en je de bestanden wilt behouden, worden ze opnieuw ge <translation>Alle bestanden verwijderen</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>Alle bestanden in de syncmap '%1' map werden verwijderd van de server. -Deze verwijderingen worden gesynchroniseerd naar je lokale syncmap, waardoor deze bestanden niet meer beschikbaar zijn, tenzij je het recht hebt om ze te herstellen. -Als je de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de server als je die autorisatie hebt. -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"/> <source>Keep files</source> <translation>Bestanden bewaren</translation> @@ -1504,7 +1504,7 @@ Als je de bestanden wilt verwijderen, worden ze niet beschikbaar, tenzij je de e <translation>Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Een oud synchronisatieverslag "%1" is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation> </message> @@ -2302,7 +2302,7 @@ Onderdelen die gewist mogen worden, worden verwijderd als ze verhinderen dat een <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="23"/> <source>The file could not be synced because it contains characters which are not allowed on this system.</source> - <translation type="unfinished"/> + <translation>Dit bestand kon niet worden gesynchroniseerd omdat het symbolen bevat die niet toegestaan zijn op dit systeem.</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="36"/> @@ -2312,7 +2312,7 @@ Onderdelen die gewist mogen worden, worden verwijderd als ze verhinderen dat een <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="49"/> <source>Please enter a new name for the file:</source> - <translation type="unfinished"/> + <translation>Voer alsjeblieft een nieuwe naam voor dit bestand in:</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="62"/> @@ -2497,7 +2497,7 @@ Logs worden geschreven naar %1</translation> <message> <location filename="../src/libsync/logger.cpp" line="151"/> <source><nobr>File "%1"<br/>cannot be opened for writing.<br/><br/>The log output <b>cannot</b> be saved!</nobr></source> - <translation type="unfinished"/> + <translation><nobr>Bestand "%1"<br/>kan niet voor schrijven worden geopend.<br/><br/>De log output kan <b>niet</b> opgeslagen worden!</nobr></translation> </message> </context> <context> @@ -2541,7 +2541,7 @@ Logs worden geschreven naar %1</translation> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3. If you confirm restart and update, your computer may reboot to complete the installation.</p></source> - <translation type="unfinished"/> + <translation><p>Een nieuwe versie van de %1 Client is beschikbaar, maar het updateproces is mislukt.</p><p><b>%2</b> is gedownload. De geïnstalleerde versie is %3. Als je herstarten en updaten bevestigd, kan je computer opnieuw opgestart worden om de installatie te voltooien.</p></translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="469"/> @@ -2727,7 +2727,7 @@ vragen om extra autorisaties tijdens installatie.</translation> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process. Your computer may reboot to complete the installation.</source> - <translation type="unfinished"/> + <translation>Een nieuwe update voor %1 wordt geïnstalleerd. De updater kan om extra privileges vragen tijdens het update proces. Je computer kan herstart worden om de installatie te voltooien.</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="143"/> @@ -2870,12 +2870,12 @@ vragen om extra autorisaties tijdens installatie.</translation> <translation>Virtuele bestanden worden niet ondersteund voor Windows-partitie-hoofdmappen als lokale map. Kies een geldige submap onder de stationsletter.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>%1 map "%2" is gesynchroniseerd naar de lokale map "%3"</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>Synchroniseer de map "%1"</translation> </message> @@ -3280,12 +3280,12 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <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"/> + <translation>Bestand eindigt in spaties en kon 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 type="unfinished"/> + <translation>Bestand eindigt in spaties en kon niet hernoemd worden omdat een bestand met dezelfde naam lokaal al bestaat.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="250"/> @@ -3373,14 +3373,24 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>permissies</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="490"/> + <source>permission</source> + <translation>permissie</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>bestand id</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>Server meldde geen %1</translation> + <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="946"/> @@ -3713,10 +3723,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <message> <location filename="../src/libsync/propagateremotemove.cpp" line="265"/> <source>Error setting pin state</source> - <translation> -Fout bij instellen pin status - - </translation> + <translation>Fout bij instellen pin status</translation> </message> <message> <location filename="../src/libsync/propagateremotemove.cpp" line="272"/> @@ -3961,7 +3968,7 @@ Fout bij instellen pin status <message> <location filename="../src/gui/sharedialog.ui" line="82"/> <source>Nextcloud Path:</source> - <translation>Nextcloud-pad:</translation> + <translation>Nextcloud Pad:</translation> </message> <message> <location filename="../src/gui/sharedialog.ui" line="113"/> @@ -4084,7 +4091,7 @@ Fout bij instellen pin status <message> <location filename="../src/gui/sharelinkwidget.cpp" line="193"/> <source>View only</source> - <translation type="unfinished"/> + <translation>Alleen lezen</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="198"/> @@ -4129,7 +4136,7 @@ Fout bij instellen pin status <message> <location filename="../src/gui/sharelinkwidget.cpp" line="305"/> <source>Delete link</source> - <translation type="unfinished"/> + <translation>Verwijder link</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> @@ -4190,7 +4197,7 @@ Fout bij instellen pin status <translation>Geen resultaten voor '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>Geen resultaten voor "%1"</translation> </message> @@ -4324,7 +4331,7 @@ Fout bij instellen pin status <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/> <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/> <source>Activity</source> - <translation type="unfinished"/> + <translation>Activiteit</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="920"/> @@ -4551,7 +4558,7 @@ Fout bij instellen pin status <message> <location filename="../src/gui/sslerrordialog.cpp" line="158"/> <source>Additional errors:</source> - <translation type="unfinished"/> + <translation>Additionele fouten:</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="166"/> @@ -4805,16 +4812,16 @@ Fout bij instellen pin status <translation>Bestandsnamen die eindigen met een punt worden niet ondersteund door het bestandssysteem.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Kon de lokale sync-database niet openen of aanmaken. Zorg ervoor dat je schrijf-toegang hebt in de sync-map</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <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/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Kon de lokale sync-database niet openen of aanmaken. Zorg ervoor dat je schrijf-toegang hebt in de sync-map</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>De bestandsnaam is een gereserveerde naam op dit bestandssysteem.</translation> @@ -4865,16 +4872,16 @@ Fout bij instellen pin status <translation>Stat mislukt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Bestandsnaamcodering is niet geldig</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Kan het sync transactielog niet openen</translation> @@ -4885,19 +4892,19 @@ Fout bij instellen pin status <translation>Ongeldige tekens, hernoem "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <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/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation>Synchronisatie wordt spoedig hervat.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> - <translation>Schijfruimte laa: Downloads die de vrije ruimte tot onder %1 zouden reduceren, zijn overgeslagen.</translation> + <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="1052"/> @@ -4911,59 +4918,59 @@ Fout bij instellen pin status <location filename="../src/gui/tray/syncstatussummary.cpp" line="124"/> <location filename="../src/gui/tray/syncstatussummary.cpp" line="313"/> <source>Offline</source> - <translation type="unfinished"/> + <translation>Offline</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="138"/> <location filename="../src/gui/tray/syncstatussummary.cpp" line="316"/> <location filename="../src/gui/tray/syncstatussummary.h" line="89"/> <source>All synced!</source> - <translation type="unfinished"/> + <translation>Alles gesynchroniseerd!</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="147"/> <source>Some files couldn't be synced!</source> - <translation type="unfinished"/> + <translation>Sommige bestanden konden niet gesynchroniseerd worden!</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="148"/> <source>See below for errors</source> - <translation type="unfinished"/> + <translation>Zie hieronder voor fouten</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="155"/> <source>Syncing</source> - <translation type="unfinished"/> + <translation>Synchroniseren</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="162"/> <source>Sync paused</source> - <translation type="unfinished"/> + <translation>Synchronisatie gepauzeerd</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="169"/> <source>Some files could not be synced!</source> - <translation type="unfinished"/> + <translation>Sommige bestanden konden niet gesynchroniseerd worden!</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="170"/> <source>See below for warnings</source> - <translation type="unfinished"/> + <translation>Zie hieronder voor waarschuwingen</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="218"/> <source>%1 of %2 · %3 left</source> - <translation type="unfinished"/> + <translation>%1 van %2 · %3 resterend</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="222"/> <source>%1 of %2</source> - <translation type="unfinished"/> + <translation>%1 van %2</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="227"/> <source>Syncing file %1 of %2</source> - <translation type="unfinished"/> + <translation>Bestand %1 van %2 synchroniseren</translation> </message> </context> <context> @@ -5046,22 +5053,22 @@ Fout bij instellen pin status <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="373"/> <source>Failed to fetch providers.</source> - <translation type="unfinished"/> + <translation>Fout bij het laden van providers.</translation> </message> <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="384"/> <source>Failed to fetch search providers for '%1'. Error: %2</source> - <translation type="unfinished"/> + <translation>Fout bij het zoeken van providers voor '%1'. Error: %2</translation> </message> <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="418"/> <source>Search has failed for '%2'.</source> - <translation type="unfinished"/> + <translation>Fout bij het zoeken naar '%2'.</translation> </message> <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="447"/> <source>Search has failed for '%1'. Error: %2</source> - <translation type="unfinished"/> + <translation>Fout bij het zoeken naar '%1'. Error: %2</translation> </message> </context> <context> @@ -5135,12 +5142,12 @@ Fout bij instellen pin status <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="148"/> <source>User status feature is not supported. You will not be able to set your user status.</source> - <translation type="unfinished"/> + <translation>Gebruikersstatus functie wordt niet ondersteund. Je zult je gebruikersstatus niet kunnen instellen.</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="152"/> <source>Emojis feature is not supported. Some user status functionality may not work.</source> - <translation type="unfinished"/> + <translation>Emoji functie wordt niet ondersteund. Sommige gebruikersstatusfuncties werken mogelijk niet.</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="156"/> @@ -5834,9 +5841,9 @@ Fout bij instellen pin status <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> - <translation type="unfinished"/> + <translation>Zoek in bestanden, berichten, afspraak ...</translation> </message> </context> <context> @@ -5844,7 +5851,7 @@ Fout bij instellen pin status <message> <location filename="../src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml" line="24"/> <source>Load more results</source> - <translation type="unfinished"/> + <translation>Laad meer resultaten</translation> </message> </context> <context> @@ -5852,7 +5859,7 @@ Fout bij instellen pin status <message> <location filename="../src/gui/tray/UnifiedSearchResultItemSkeleton.qml" line="25"/> <source>Search result skeleton.</source> - <translation type="unfinished"/> + <translation>Zoekresultaat skelet.</translation> </message> </context> <context> @@ -5860,7 +5867,7 @@ Fout bij instellen pin status <message> <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/> <source>Load more results</source> - <translation type="unfinished"/> + <translation>Laad meer resultaten</translation> </message> </context> <context> @@ -5877,23 +5884,23 @@ Fout bij instellen pin status </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Account verbonden</translation> + <source>Current user status is online</source> + <translation>Huidige gebruikersstatus is online</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Account niet verbonden</translation> + <source>Current user status is do not disturb</source> + <translation>Huidige gebruikersstatus is niet storen</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Huidige gebruikersstatus is online</translation> + <source>Account connected</source> + <translation>Account verbonden</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Huidige gebruikersstatus is niet storen</translation> + <source>Account not connected</source> + <translation>Account niet verbonden</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5906,7 +5913,7 @@ Fout bij instellen pin status <translation>Verwijder Account</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Status instellen</translation> </message> @@ -6097,7 +6104,7 @@ Fout bij instellen pin status <translation>Synchronisatie voor iedereen onderbreken</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Gebruikersstatus instellen</translation> </message> @@ -6197,9 +6204,9 @@ Fout bij instellen pin status <translation>Open het dialoogvenster voor delen</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> - <translation type="unfinished"/> + <translation>Samengevoegde zoekresultaten lijst</translation> </message> <message> <location filename="../src/gui/tray/Window.qml" line="720"/> @@ -6208,9 +6215,9 @@ Fout bij instellen pin status <translation>Toon meer acties</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> - <translation type="unfinished"/> + <translation>%1 - Bestandsactiviteit</translation> </message> </context> <context> diff --git a/translations/client_oc.ts b/translations/client_oc.ts index decb9749d..fc942c79a 100644 --- a/translations/client_oc.ts +++ b/translations/client_oc.ts @@ -1338,13 +1338,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1397,7 +1390,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1405,7 +1413,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1422,14 +1430,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Suprimir totes los fichièrs</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>Gardar los fichièrs</translation> @@ -1476,7 +1476,7 @@ 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/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2825,12 +2825,12 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3321,13 +3321,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4135,7 +4145,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Cap de resultat per « %1 »</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4750,13 +4760,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/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <location filename="../src/libsync/syncengine.cpp" line="507"/> + <source>File names containing the character '%1' are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="507"/> - <source>File names containing the character '%1' are not supported on this file system.</source> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation type="unfinished"/> </message> <message> @@ -4810,13 +4820,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/libsync/syncengine.cpp" line="560"/> - <source>Unable to read from the sync journal.</source> + <location filename="../src/libsync/syncengine.cpp" line="571"/> + <source>Filename encoding is not valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> - <source>Filename encoding is not valid</source> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> <translation type="unfinished"/> </message> <message> @@ -4830,13 +4840,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/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> + <location filename="../src/libsync/syncengine.cpp" line="1110"/> + <source>File name contains at least one invalid character</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1110"/> - <source>File name contains at least one invalid character</source> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> <translation type="unfinished"/> </message> <message> @@ -5779,7 +5789,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5822,23 +5832,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Compte connectat</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Compte pas connectat</translation> + <source>Current user status is do not disturb</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Compte connectat</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation type="unfinished"/> + <source>Account not connected</source> + <translation>Compte pas connectat</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5851,7 +5861,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Levar compte</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6042,7 +6052,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Suspendre la sincro. per totes</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6142,7 +6152,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Dobrir fenèstra de partatge</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6153,7 +6163,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Veire mai d’accions</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_pl.ts b/translations/client_pl.ts index efb5f511a..9787ec5d0 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -1320,7 +1320,7 @@ Może to być problem z bibliotekami OpenSSL.</translation> <location filename="../src/gui/folder.cpp" line="1103"/> <source>A folder from an external storage has been added. </source> - <translation>Dodano katalog z pamięci zewnętrznej. + <translation>Dodano katalog z magazynu zewnętrznego. </translation> </message> <message> @@ -1352,15 +1352,6 @@ Oznacza to, że klient synchronizacji może nie przesyłać natychmiast zmian lo %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>Wszystkie pliki w lokalnym katalogu synchronizacji '%1' zostały usunięte. Te usunięcia zostaną zsynchronizowane z Twoim serwerem, co oznacza całkowite ich usunięcie -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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1420,7 +1411,27 @@ Kontynuowanie synchronizacji w normalny sposób spowoduje zastąpienie wszystkic <translation>Zachowaj pliki lokalne jako pliki konfliktu</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>Wszystkie pliki z katalogu synchronizacji '%1' zostały usunięte z serwera. +W momencie synchronizacji zostaną usunięte z lokalnego katalogu, co spowoduje ich niedostępność, chyba że posiadasz prawo do przywracania. +Jeśli zdecydujesz się przywrócić pliki i posiadasz odpowiednie uprawnienia, zostaną one ponownie wysłane na serwer. +Jeśli zdecydujesz się je usunąć, nie będą już dostępne.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>Wszystkie pliki w lokalnym katalogu synchronizacji '%1' zostały usunięte. Te usunięcia zostaną zsynchronizowane z Twoim serwerem, co oznacza całkowite ich usunięcie +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="1255"/> <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. @@ -1431,7 +1442,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1450,17 +1461,6 @@ Jeśli to był przypadek i zdecydujesz się zachować swoje pliki, zostaną one <translation>Usuń wszystkie pliki</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>Wszystkie pliki z katalogu synchronizacji '%1' zostały usunięte z serwera. -W momencie synchronizacji zostaną usunięte z lokalnego katalogu, co spowoduje ich niedostępność, chyba że posiadasz prawo do przywracania. -Jeśli zdecydujesz się przywrócić pliki i posiadasz odpowiednie uprawnienia, zostaną one ponownie wysłane na serwer. -Jeśli zdecydujesz się je usunąć, nie będą już dostępne.</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>Zachowaj pliki</translation> @@ -1507,7 +1507,7 @@ Jeśli zdecydujesz się je usunąć, nie będą już dostępne.</translation> <translation>Znaleziono stary dziennik synchronizacji '%1', ale nie można go usunąć. Upewnij się, że żadna aplikacja go nie używa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Znaleziono stary dziennik synchronizacji "%1", ale nie można go usunąć. Upewnij się, że żadna aplikacja go nie używa.</translation> </message> @@ -2868,12 +2868,12 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</translation> <translation>Pliki wirtualne nie są obsługiwane w przypadku katalogów głównych partycji Windows jako katalogu lokalnego. Wybierz prawidłowy podkatalog według litery dysku.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>Katalog %1 "%2" jest synchronizowany z katalogiem lokalnym "%3"</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>Synchronizuj katalog "%1"</translation> </message> @@ -3371,14 +3371,24 @@ 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="490"/> + <source>permission</source> + <translation>pozwolenie</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>id pliku</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>serwer zgłosił brak %1</translation> + <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="946"/> @@ -4185,7 +4195,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Brak wyników dla '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>Brak wyników dla "%1"</translation> </message> @@ -4800,16 +4810,16 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Nazwy plików kończące się kropką nie są obsługiwane w tym systemie plików.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Nie można otworzyć lub utworzyć lokalnej bazy danych synchronizacji. Upewnij się, że masz dostęp do zapisu w katalogu synchronizacji.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <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/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Nie można otworzyć lub utworzyć lokalnej bazy danych synchronizacji. Upewnij się, że masz dostęp do zapisu w katalogu synchronizacji.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <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> @@ -4860,16 +4870,16 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Błąd statystyk.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Kodowanie nazwy pliku jest nieprawidłowe</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Nie można otworzyć dziennika synchronizacji</translation> @@ -4880,16 +4890,16 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Nieprawidłowe znaki, zmień nazwę "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation>Synchronizacja zostanie wkrótce wznowiona.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <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/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation>Synchronizacja zostanie wkrótce wznowiona.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5829,7 +5839,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation>Szukaj plików, wiadomości, wydarzeń…</translation> </message> @@ -5872,23 +5882,23 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Połączono z kontem</translation> + <source>Current user status is online</source> + <translation>Aktualny status użytkownika to "Online"</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Konto nie jest połączone</translation> + <source>Current user status is do not disturb</source> + <translation>Aktualny status użytkownika to "Nie przeszkadzać"</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Aktualny status użytkownika to "Online"</translation> + <source>Account connected</source> + <translation>Połączono z kontem</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Aktualny status użytkownika to "Nie przeszkadzać"</translation> + <source>Account not connected</source> + <translation>Konto nie jest połączone</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5901,7 +5911,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Usuń konto</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Ustaw status</translation> </message> @@ -6092,7 +6102,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Wstrzymaj synchronizację dla wszystkich</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Ustaw status użytkownika</translation> </message> @@ -6192,7 +6202,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Otwórz okno udostępnienia</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation>Ujednolicona lista wyników wyszukiwania</translation> </message> @@ -6203,7 +6213,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Pokaż więcej akcji</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation>%1 — Aktywność pliku</translation> </message> diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 0d86670fc..7159569aa 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -1340,13 +1340,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1401,7 +1394,22 @@ Continuando a sincronização fará com que todos os seus ficheiros sejam substi <translation>Manter Ficheiros Locais como Conflito</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1409,7 +1417,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1426,14 +1434,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1480,7 +1480,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Foi encontrado um 'journal' de sincronização, mas não foi possível removê-lo. Por favor, certifique-se que nenhuma aplicação o está a utilizar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2832,12 +2832,12 @@ poderá pedir por privilégios adicionais durante o processo.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3328,13 +3328,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4142,7 +4152,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Sem resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4757,16 +4767,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nomes de ficheiros acabados com um ponto final não são suportados neste sistema de ficheiros.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Não foi possível abrir ou criar a base de dados de sincronização local. Verifique se tem acesso de gravação na pasta de sincronização.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Nomes de ficheiros que contêm o caractér '%1' não são suportados neste sistema de ficheiros.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Não foi possível abrir ou criar a base de dados de sincronização local. Verifique se tem acesso de gravação na pasta de sincronização.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>O nome de ficheiro é um nome reservado neste sistema de ficheiros.</translation> @@ -4817,16 +4827,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Estado falhou.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Codificação de nome de ficheiro não é válida</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Impossível abrir o jornal de sincronismo</translation> @@ -4837,16 +4847,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Carateres inválidos, por favor, renomeie "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>O nome de ficheiro contém pelo menos um caráter inválido</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5786,7 +5796,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5829,22 +5839,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Conta ligada</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Conta ligada</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5858,7 +5868,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6049,7 +6059,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6149,7 +6159,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6160,7 +6170,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index c38be1458..ff2099157 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -1352,15 +1352,6 @@ Isso significa que o cliente de sincronização pode não fazer upload de altera %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1420,7 +1411,27 @@ Continuar a sincronização como normal fará com que todos os seus arquivos sej <translation>Manter Arquivos Locais como Conflito</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>Todos os arquivos na pasta de sincronização '%1' foram excluídos do servidor. +Essas exclusões serão sincronizadas com sua pasta de sincronização local, tornando esses arquivos indisponíveis, a menos que você tenha o direito de restaurá-los. +Se você decidir restaurar os arquivos, eles serão sincronizados novamente com o servidor se você tiver direitos para fazer isso. +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="1260"/> + <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="1255"/> <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. @@ -1431,7 +1442,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1448,17 +1459,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Remover todos os arquivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>Todos os arquivos na pasta de sincronização '%1' foram excluídos do servidor. -Essas exclusões serão sincronizadas com sua pasta de sincronização local, tornando esses arquivos indisponíveis, a menos que você tenha o direito de restaurá-los. -Se você decidir restaurar os arquivos, eles serão sincronizados novamente com o servidor se você tiver direitos para fazer isso. -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"/> <source>Keep files</source> <translation>Manter arquivos</translation> @@ -1505,7 +1505,7 @@ Se você decidir excluir os arquivos, eles ficarão indisponíveis para você, a <translation>Uma antiga atividade de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está usando-a.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Um antigo diário de sincronização "%1" foi encontrado, mas não pôde ser removido. Certifique-se de que nenhum aplicativo o esteja usando no momento. </translation> </message> @@ -2865,12 +2865,12 @@ pode solicitar por privilégios adicionais durante o processo.</translation> <translation>Arquivos virtuais não são suportados como partição raiz do Windows como pasta local. Escolha uma subpasta válida na letra da unidade. </translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>%1 pasta "%2" está sincronizada com a pasta local "%3" </translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>Sincronizar a pasta "%1"</translation> </message> @@ -3369,14 +3369,24 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>ID do arquivo</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>servidor relatou não %1</translation> + <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="946"/> @@ -4183,7 +4193,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Sem resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>Nenhum resultado para "%1"</translation> </message> @@ -4798,16 +4808,16 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Os nomes de arquivos que terminam com um ponto não são suportados neste sistema de arquivos.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Não é possível abrir ou criar o banco de dados de sincronização local. Certifique-se de ter acesso de gravação na pasta de sincronização.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Os nomes de arquivos que contêm o caractere '%1' não são suportados neste sistema de arquivos.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Não é possível abrir ou criar o banco de dados de sincronização local. Certifique-se de ter acesso de gravação na pasta de sincronização.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <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> @@ -4858,16 +4868,16 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Stat falhou.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>A codificação do nome do arquivo é inválida</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Não é possível abrir o arquivo de sincronização</translation> @@ -4878,16 +4888,16 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Caracteres inválidos, favor renomear "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation>A sincronização será retomada em breve.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <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/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation>A sincronização será retomada em breve.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5827,7 +5837,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5870,23 +5880,23 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Conta conectada</translation> + <source>Current user status is online</source> + <translation>Online é o status atual do usuário</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Conta não conectada</translation> + <source>Current user status is do not disturb</source> + <translation>Não Perturbe é o status atual do usuário</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Online é o status atual do usuário</translation> + <source>Account connected</source> + <translation>Conta conectada</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Não Perturbe é o status atual do usuário</translation> + <source>Account not connected</source> + <translation>Conta não conectada</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5899,7 +5909,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Remover conta</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Definir status</translation> </message> @@ -6090,7 +6100,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Pausar a sincronização para todos</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Definir o status do usuário</translation> </message> @@ -6190,7 +6200,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Abrir janela de compartilhamento</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation>Lista unificada de resultados de pesquisa </translation> </message> @@ -6201,7 +6211,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Mostrar mais ações</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation>%1 - Atividade de arquivo</translation> </message> diff --git a/translations/client_ro.ts b/translations/client_ro.ts index f95616a05..6efa960a2 100644 --- a/translations/client_ro.ts +++ b/translations/client_ro.ts @@ -1351,15 +1351,6 @@ Acest lucru înseamnă că aplicația de sincronizare ar putea să nu încarce %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>Toate fisierele din dosarul local de sincronizare '%1' au fost șterse. Aceste acțiuni vor fi sincronizate cu serverul tău, drept urmare aceste fisiere vor deveni indisponibile. -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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1417,7 +1408,24 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Păstrează fișierele locale ca și conflicte</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>Toate fisierele din dosarul local de sincronizare '%1' au fost șterse. Aceste acțiuni vor fi sincronizate cu serverul tău, drept urmare aceste fisiere vor deveni indisponibile. +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="1255"/> <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. @@ -1425,7 +1433,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1442,14 +1450,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Șterge toate fișierele</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>Păstrează fișierele</translation> @@ -1496,7 +1496,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Un jurnal de sicronizare vechi '%1' a fost găsit, dar acesta nu a putut fi șters. Vă rugăm să vă asigurați că acest jurnal nu este folosit de o aplicație.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Un jurnal de sicronizare vechi '%1' a fost găsit, dar acesta nu a putut fi șters. Vă rugăm să vă asigurați că acest jurnal nu este folosit de o aplicație.</translation> </message> @@ -2845,12 +2845,12 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3341,13 +3341,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4155,7 +4165,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Niciun rezultat pentru '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4768,13 +4778,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/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <location filename="../src/libsync/syncengine.cpp" line="507"/> + <source>File names containing the character '%1' are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="507"/> - <source>File names containing the character '%1' are not supported on this file system.</source> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation type="unfinished"/> </message> <message> @@ -4828,13 +4838,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/libsync/syncengine.cpp" line="560"/> - <source>Unable to read from the sync journal.</source> + <location filename="../src/libsync/syncengine.cpp" line="571"/> + <source>Filename encoding is not valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="571"/> - <source>Filename encoding is not valid</source> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> <translation type="unfinished"/> </message> <message> @@ -4848,16 +4858,16 @@ 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="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>Numele fișierului conține cel puțin un caracter invalid</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> @@ -5797,7 +5807,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5840,22 +5850,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Cont conectat</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Cont conectat</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5869,7 +5879,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6060,7 +6070,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6160,7 +6170,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6171,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index ad8cc5c71..11a986d79 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -33,7 +33,7 @@ <message> <location filename="../src/gui/tray/ActivityItem.qml" line="240"/> <source>View activity</source> - <translation type="unfinished"/> + <translation>Просмотр активности</translation> </message> </context> <context> @@ -41,7 +41,7 @@ <message> <location filename="../src/gui/tray/ActivityList.qml" line="24"/> <source>Activity list</source> - <translation type="unfinished"/> + <translation>Список действий</translation> </message> </context> <context> @@ -144,7 +144,7 @@ <location filename="../src/common/filesystembase.cpp" line="398"/> <location filename="../src/common/filesystembase.cpp" line="404"/> <source>Could not move "%1" to "%2"</source> - <translation type="unfinished"/> + <translation>Не удалось переместить "%1" в "%2"</translation> </message> <message> <location filename="../src/common/filesystembase.cpp" line="438"/> @@ -1350,15 +1350,6 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>Из локальной синхронизируемой папки «%1» удалены все файлы. Информация об удалении будет отправлена на сервер, таким образом сделав файлы недоступными, если только не восстанавливать их из резервной копии. -Действительно выполнить синхронизировать с этими изменениями? -Если это произошло случайно, и вы решите сохранить файлы, они будут повторно скачаны с сервера.</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1052"/> <source>All files in the sync folder '%1' 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. @@ -1416,7 +1407,27 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Сохранить локальные файлы как конфликтующие</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>Из синхронизируемой папки «%1» на стороне сервера удалены все файлы. +При синхронизации будет выполнено удаление локальной копии файлов, что сделает их недоступными при отсутствии прав на восстановление удалённых файлов. +При выборе «Сохранить файлы» и наличии соответствующих прав доступа, файлы будут повторно переданы на сервер. +При выборе «Удалить файлы», файлы станут недоступны, кроме случая, когда вы являетесь их владельцем.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>Из локальной синхронизируемой папки «%1» удалены все файлы. Информация об удалении будет отправлена на сервер, таким образом сделав файлы недоступными, если только не восстанавливать их из резервной копии. +Действительно выполнить синхронизировать с этими изменениями? +Если это произошло случайно, и вы решите сохранить файлы, они будут повторно скачаны с сервера.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1255"/> <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. @@ -1427,7 +1438,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1446,17 +1457,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Удалить все файлы</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>Из синхронизируемой папки «%1» на стороне сервера удалены все файлы. -При синхронизации будет выполнено удаление локальной копии файлов, что сделает их недоступными при отсутствии прав на восстановление удалённых файлов. -При выборе «Сохранить файлы» и наличии соответствующих прав доступа, файлы будут повторно переданы на сервер. -При выборе «Удалить файлы», файлы станут недоступны, кроме случая, когда вы являетесь их владельцем.</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>Сохранить файлы</translation> @@ -1503,7 +1503,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Найден старый журнал синхронизации '%1', и он не может быть удалён. Убедитесь что он не открыт в другом приложении.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Найден старый журнал синхронизации «%1», но он не может быть удалён. Убедитесь, что файл журнала не открыт в другом приложении.</translation> </message> @@ -2290,62 +2290,62 @@ Items where deletion is allowed will be deleted if they prevent a directory from <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="14"/> <source>Invalid filename</source> - <translation type="unfinished"/> + <translation>Неверное имя файла</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="23"/> <source>The file could not be synced because it contains characters which are not allowed on this system.</source> - <translation type="unfinished"/> + <translation>Файл не может быть синхронизирован, поскольку он содержит символы, недопустимые в этой системе.</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="36"/> <source>Error</source> - <translation type="unfinished"/> + <translation>Ошибка</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="49"/> <source>Please enter a new name for the file:</source> - <translation type="unfinished"/> + <translation>Введите новое имя для файла:</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="62"/> <source>New filename</source> - <translation type="unfinished"/> + <translation>Новое имя файла</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> <source>Rename file</source> - <translation type="unfinished"/> + <translation>Переименуйте файл</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="87"/> <source>The file %1 could not be synced because the name contains characters which are not allowed on this system.</source> - <translation type="unfinished"/> + <translation>Не удалось синхронизировать файл % 1, поскольку имя содержит символы, недопустимые в этой системе.</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="88"/> <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < ></source> - <translation type="unfinished"/> + <translation>В системе запрещены следующие символы: * "| &?,;: \ / ~ <></translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/> <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"/> + <translation>У вас нет разрешения на переименование этого файла. Попросите автора файла переименовать его.</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> <source>Filename contains illegal characters: %1</source> - <translation type="unfinished"/> + <translation>Имя файла содержит недопустимые символы: % 1</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> <source>Could not rename file. Please make sure you are connected to the server.</source> - <translation type="unfinished"/> + <translation>Не удалось переименовать файл. Убедитесь, что вы подключены к серверу.</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> <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"/> + <translation>Невозможно переименовать файл, поскольку файл с таким именем уже существует на сервере. Пожалуйста, выберите другое имя.</translation> </message> </context> <context> @@ -2760,7 +2760,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please open <a href='%1'>%1</a> to download the update manually.</source> - <translation type="unfinished"/> + <translation>Не удалось загрузить обновление. Откройте <a href='%1'>1%</a>, чтобы загрузить обновление вручную.</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="157"/> @@ -2775,7 +2775,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source> - <translation type="unfinished"/> + <translation>Доступен новый % 1. Откройте <a href='%2'>%2</a>, чтобы загрузить обновление.</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="161"/> @@ -2863,12 +2863,12 @@ for additional privileges during the process.</source> <translation>В ОС Windows механизм виртуальных файлов не поддерживается для корневой уровня файловой системы. Для продолжения выберите папку на диске, а не сам диск.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>%1 каталог «%2» синхронизирован с локальной папкой «%3»</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>Синхронизировать папку «%1»</translation> </message> @@ -3274,12 +3274,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <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"/> + <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 type="unfinished"/> + <translation>Файл содержит конечные пробелы и не может быть переименован, поскольку файл с таким именем уже существует локально.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="250"/> @@ -3367,14 +3367,24 @@ 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="490"/> + <source>permission</source> + <translation>разрешение</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>id файла</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>ответ сервера: %1 отсуствует</translation> + <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="946"/> @@ -4075,7 +4085,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sharelinkwidget.cpp" line="193"/> <source>View only</source> - <translation type="unfinished"/> + <translation>Только просмотр</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="198"/> @@ -4100,7 +4110,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sharelinkwidget.cpp" line="222"/> <source>Link name</source> - <translation type="unfinished"/> + <translation>Название ссылки</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="218"/> @@ -4120,7 +4130,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sharelinkwidget.cpp" line="305"/> <source>Delete link</source> - <translation type="unfinished"/> + <translation>Удалить ссылку</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> @@ -4181,7 +4191,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Отсутствуют результаты поиска «%1»</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>Отсутствуют результаты поиска «%1»</translation> </message> @@ -4315,7 +4325,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/> <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/> <source>Activity</source> - <translation type="unfinished"/> + <translation>Активность</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="920"/> @@ -4542,7 +4552,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sslerrordialog.cpp" line="158"/> <source>Additional errors:</source> - <translation type="unfinished"/> + <translation>Дополнительные ошибки</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="166"/> @@ -4796,16 +4806,16 @@ 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="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Не могу открыть или создать локальную базу данных синхронизации. Удостоверьтесь, что у вас есть доступ на запись в каталог синхронизации.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Эта файловая система не поддерживает имена файлов, содержащие символ '%1'.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Не могу открыть или создать локальную базу данных синхронизации. Удостоверьтесь, что у вас есть доступ на запись в каталог синхронизации.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>Данное имя файла зарезервировано в данной файловой системе.</translation> @@ -4856,16 +4866,16 @@ 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="560"/> - <source>Unable to read from the sync journal.</source> - <translation>Не удалось прочитать из журнала синхронизации.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="571"/> <source>Filename encoding is not valid</source> <translation>Кодировка имени файла не верна</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> + <translation>Не удалось прочитать из журнала синхронизации.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="643"/> <source>Cannot open the sync journal</source> <translation>Не удаётся открыть журнал синхронизации</translation> @@ -4876,16 +4886,16 @@ 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="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>Имя файла содержит по крайней мере один некорректный символ</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation>Синхронизация возобновится в ближайшее время.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Мало места на диске: Скачивания, которые сократят свободное место ниже %1, будут пропущены.</translation> @@ -4902,44 +4912,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <location filename="../src/gui/tray/syncstatussummary.cpp" line="124"/> <location filename="../src/gui/tray/syncstatussummary.cpp" line="313"/> <source>Offline</source> - <translation type="unfinished"/> + <translation>Не в сети</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="138"/> <location filename="../src/gui/tray/syncstatussummary.cpp" line="316"/> <location filename="../src/gui/tray/syncstatussummary.h" line="89"/> <source>All synced!</source> - <translation type="unfinished"/> + <translation>Все синхронизировано!</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="147"/> <source>Some files couldn't be synced!</source> - <translation type="unfinished"/> + <translation>Некоторые файлы не синхронизировались!</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="148"/> <source>See below for errors</source> - <translation type="unfinished"/> + <translation>Смотрите ошибки ниже</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="155"/> <source>Syncing</source> - <translation type="unfinished"/> + <translation>Синхронизации</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="162"/> <source>Sync paused</source> - <translation type="unfinished"/> + <translation>Синхронизация приостановлена</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="169"/> <source>Some files could not be synced!</source> - <translation type="unfinished"/> + <translation>Некоторые файлы не могут быть синхронизированы!</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="170"/> <source>See below for warnings</source> - <translation type="unfinished"/> + <translation>Смотрите предупреждения ниже.</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="218"/> @@ -5037,7 +5047,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="373"/> <source>Failed to fetch providers.</source> - <translation type="unfinished"/> + <translation>Не удалось получить поставщиков.</translation> </message> <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="384"/> @@ -5826,9 +5836,9 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> - <translation type="unfinished"/> + <translation>Искать файлы, сообщения, события…</translation> </message> </context> <context> @@ -5836,7 +5846,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml" line="24"/> <source>Load more results</source> - <translation type="unfinished"/> + <translation>Показать больше результатов</translation> </message> </context> <context> @@ -5852,7 +5862,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/> <source>Load more results</source> - <translation type="unfinished"/> + <translation>Показать больше результатов</translation> </message> </context> <context> @@ -5869,23 +5879,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Аккаунт подключен</translation> + <source>Current user status is online</source> + <translation>Текущий статус пользователя - в сети</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Учётная запись не подключена</translation> + <source>Current user status is do not disturb</source> + <translation>Текущий статус пользователя - не беспокоить</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Текущий статус пользователя - в сети</translation> + <source>Account connected</source> + <translation>Аккаунт подключен</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Текущий статус пользователя - не беспокоить</translation> + <source>Account not connected</source> + <translation>Учётная запись не подключена</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5898,7 +5908,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Установить статус</translation> </message> @@ -6089,7 +6099,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Задать статус</translation> </message> @@ -6189,9 +6199,9 @@ 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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> - <translation type="unfinished"/> + <translation>Единый список результатов поиска</translation> </message> <message> <location filename="../src/gui/tray/Window.qml" line="720"/> @@ -6200,9 +6210,9 @@ 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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> - <translation type="unfinished"/> + <translation>%1 - Файловая активность</translation> </message> </context> <context> diff --git a/translations/client_sc.ts b/translations/client_sc.ts index 81877c5fc..4ddceac7a 100644 --- a/translations/client_sc.ts +++ b/translations/client_sc.ts @@ -1352,15 +1352,6 @@ Custu bolet nàrrere chi sa sincronizatzione de su cliente diat pòdere non carr %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>Totu is archìvios in sa cartella de sincronizatzione '%1' sunt eliminados in su serbidore. -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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1420,7 +1411,27 @@ Sighende sa sincronizatzione comente norma s'ant a subraiscrìere totu is a <translation>Mantene archìvios locales comente cunflitu</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>Totu is archìvios in sa cartella de sincronizatzione '%1' sunt istados eliminados in su serbidore. +Sa cantzelladura at a èssere sincronizada cun sa cartella de sincronizatzione locale tua, gasi chi custos archìvios no ant a èssere prus a disponimentu, francu chi apas su permissu pro ddos pòdere ripristinare. +Si detzides de ripristinare is archìvios, custos ant a èssere sincronizados torra cun su serbidore, si tenes is diritos pro ddu fàghere. +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="1260"/> + <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>Totu is archìvios in sa cartella de sincronizatzione '%1' sunt eliminados in su serbidore. +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="1255"/> <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. @@ -1431,7 +1442,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1451,17 +1462,6 @@ Si custu fiat un'errore e detzides de mantènnere is archìvios tuos, custo <translation>Boga totu is archìvios?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>Totu is archìvios in sa cartella de sincronizatzione '%1' sunt istados eliminados in su serbidore. -Sa cantzelladura at a èssere sincronizada cun sa cartella de sincronizatzione locale tua, gasi chi custos archìvios no ant a èssere prus a disponimentu, francu chi apas su permissu pro ddos pòdere ripristinare. -Si detzides de ripristinare is archìvios, custos ant a èssere sincronizados torra cun su serbidore, si tenes is diritos pro ddu fàghere. -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"/> <source>Keep files</source> <translation>Mantene is archìvios</translation> @@ -1508,7 +1508,7 @@ Si detzides de cantzellare is archìvios, non ant a èssere prus a disponimentu, <translation>Agatadu unu registru betzu de archiviatzione '%1', ma non faghet a ddu bogare. Pro praghere, segura·ti chi peruna aplicatzione ddu siat impreende.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Agatadu unu registru betzu de archiviatzione "%1" ma non faghet a ddu bogare. Assegura•ti chi peruna aplicatzione siat impreende•ddu.</translation> </message> @@ -2868,12 +2868,12 @@ privilègios in prus durante su protzessu.</translation> <translation>Is archìvios virtuales no sunt suportados pro is sorgentes de partzidura de Windows comente cartellas locales. Sèbera una sutacartella bàlida a suta de sa lìtera de su discu.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>Sa cartella %1 de "%2" est sincronizada cun sa cartella locale "%3"</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>Sincroniza sa cartella "%1"</translation> </message> @@ -3370,14 +3370,24 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>id de s'archìviu</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> + <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="946"/> @@ -4184,7 +4194,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Perunu resurtadu pro '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>Perunu resurtadu pro "%1"</translation> </message> @@ -4799,16 +4809,16 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Is nòmines chi agabant cun unu puntu non sunt suportados in custu archìviu de sistema.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Impossìbile a abèrrere o a creare sa base de datos locale de sincronizatzione. Segura·ti de àere atzessu de iscritura in sa cartella de sincronizatzione.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Is nùmenes de is archìvios chi tenent su caràtere '%1' non sunt suportados in custu archìviu de sistema.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Impossìbile a abèrrere o a creare sa base de datos locale de sincronizatzione. Segura·ti de àere atzessu de iscritura in sa cartella de sincronizatzione.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation> Su nùmene de s'archìviu est riservadu in custu archìviu de sistema.</translation> @@ -4859,16 +4869,16 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Stat faddida.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Codìfica de su nùmene de s'archìviu non bàlida.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Non faghet a abèrrerer su registru de sincronizatzione</translation> @@ -4879,16 +4889,16 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation> Caràteres non bàlidos, torra a numenare "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <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="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5828,7 +5838,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5871,23 +5881,23 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Contu connètidu</translation> + <source>Current user status is online</source> + <translation>S'istadu atuale de s'utente est in lìnia</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Contu non connètidu</translation> + <source>Current user status is do not disturb</source> + <translation>S'istadu atuale de s'utente est chi non si cheret istorbadu</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>S'istadu atuale de s'utente est in lìnia</translation> + <source>Account connected</source> + <translation>Contu connètidu</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>S'istadu atuale de s'utente est chi non si cheret istorbadu</translation> + <source>Account not connected</source> + <translation>Contu non connètidu</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5900,7 +5910,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Boga·nche su contu</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Imposta istadu</translation> </message> @@ -6091,7 +6101,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Pone in pasu sincronizatzione pro totu</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Imposta istadu de s'utente</translation> </message> @@ -6191,7 +6201,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Aberi bentana de cumpartzidura</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6202,7 +6212,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Mustra àteras atziones</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_sk.ts b/translations/client_sk.ts index 93c7b4da5..88648fc32 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -1352,15 +1352,6 @@ To znamená, že klient synchronizácie nemusí okamžite odovzdať lokálne zme % 1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>Všetky súbory vo vašej lokálnej synchronizovanom priečinku '%1' boli vymazané. Tieto súbory budú vymazané aj na serveri a teda už viac nebudú dostupné až kým ich neobnovíte. -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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1420,7 +1411,27 @@ Pokračovaním v synchronizácii spôsobí prepísanie všetkých vašich súbor <translation>Ponechať lokálne súbory ako konfliktné</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>Všetky súbory v synchronizačnom priečinku '%1' boli na serveri vymazané. +Tieto zmeny budú synchronizované do lokálneho synchronizačného priečinka, takže už tieto vymazané súbory nebudú dostupné, ak máte oprávnenie pre ich obnovu. +Ak sa rozhodnete lokálne súbory ponechať, budú znovu synchronizované so serverom ak na to máte oprávnenie. +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="1260"/> + <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>Všetky súbory vo vašej lokálnej synchronizovanom priečinku '%1' boli vymazané. Tieto súbory budú vymazané aj na serveri a teda už viac nebudú dostupné až kým ich neobnovíte. +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="1255"/> <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. @@ -1431,7 +1442,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1450,17 +1461,6 @@ Ak to bol omyl a rozhodnete sa tieto súbory ponechať, budú opäť synchronizo <translation>Odstrániť všetky súbory</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>Všetky súbory v synchronizačnom priečinku '%1' boli na serveri vymazané. -Tieto zmeny budú synchronizované do lokálneho synchronizačného priečinka, takže už tieto vymazané súbory nebudú dostupné, ak máte oprávnenie pre ich obnovu. -Ak sa rozhodnete lokálne súbory ponechať, budú znovu synchronizované so serverom ak na to máte oprávnenie. -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"/> <source>Keep files</source> <translation>Ponechať súbory</translation> @@ -1507,7 +1507,7 @@ Ak sa rozhodnete súbory vymazať tak následne už nebudú dostupné, ak nie st <translation>Starý synchronizačný žurnál '%1' nájdený, avšak neodstrániteľný. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Bol nájdený starý žurnál synchronizácie "%1", avšak nemôže byť odstránený. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva.</translation> </message> @@ -2868,12 +2868,12 @@ môžu byť vyžadované dodatočné oprávnenia.</translation> <translation>Virtuálne súbory nie sú podporované na koreňovej partícii Windows ako lokálny priečinok. Prosím vyberte validný priečinok pod písmenom disku.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>%1 priečinok "%2" je zosynchronizovaný do lokálneho priečinka "%3"</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>Sychronizovať priečinok "%1"</translation> </message> @@ -3370,14 +3370,24 @@ 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="490"/> + <source>permission</source> + <translation>oprávnenie</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>id súboru</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>server nevrátil žiadne %1</translation> + <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="946"/> @@ -4184,7 +4194,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Žiadne výsledky pre '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>Žiadne výsledky pre "%1"</translation> </message> @@ -4799,16 +4809,16 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Názvy súborov končiacich bodkou nie sú na tomto súborovom systéme podporované.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Nie je možné otvoriť alebo vytvoriť miestnu synchronizačnú databázu. Skontrolujte či máte právo na zápis do synchronizačného priečinku.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <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/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Nie je možné otvoriť alebo vytvoriť miestnu synchronizačnú databázu. Skontrolujte či máte právo na zápis do synchronizačného priečinku.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <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 (nie je možné ho použiť).</translation> @@ -4859,16 +4869,16 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Nepodarilo sa získať informácie o súbore.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Kódovanie znakov názvu súboru je neplatné</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Nemožno otvoriť sync žurnál</translation> @@ -4879,16 +4889,16 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Neplatné znaky, premenujte prosím "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation>Synchronizácia bude čoskoro pokračovať.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>Názov súboru obsahuje nevhodný znak</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation>Synchronizácia bude čoskoro pokračovať.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -5828,7 +5838,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation>Vyhľadať súbory, správy, udalosti ...</translation> </message> @@ -5871,23 +5881,23 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Účet pripojený</translation> + <source>Current user status is online</source> + <translation>Stav aktuálneho užívateľa je pripojený</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Účet nie je pripojený</translation> + <source>Current user status is do not disturb</source> + <translation>Stav aktuálneho užívateľa je nerušiť</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Stav aktuálneho užívateľa je pripojený</translation> + <source>Account connected</source> + <translation>Účet pripojený</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Stav aktuálneho užívateľa je nerušiť</translation> + <source>Account not connected</source> + <translation>Účet nie je pripojený</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5900,7 +5910,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Odobrať účet</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Nastaviť stav</translation> </message> @@ -6091,7 +6101,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Pozastaviť synchronizáciu pre všetky účty</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Nastaviť status užívateľa</translation> </message> @@ -6191,7 +6201,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Otvoriť dialógové okno sprístupnenia</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation>Jednotný zoznam výsledkov vyhľadávania</translation> </message> @@ -6202,7 +6212,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Zobraziť ďalšie akcie</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation>%1 - Aktivita súboru</translation> </message> diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 32b876200..7ec658e81 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -1352,15 +1352,6 @@ To pomeni, da odjemalec usklajevanja ne pošilja krajevnih sprememb takoj in mor %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>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.</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1052"/> <source>All files in the sync folder '%1' 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. @@ -1420,7 +1411,27 @@ Z nadaljevanjem usklajevanja bodo vse trenutne datoteke zato prepisane s starej <translation>Ohrani krajevne datoteke kot datoteke v sporu</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>Vse datoteke v usklajevani mapi »%1« so bile na strežniku izbrisane. +Sprememba bo usklajena tudi s krajevno mapo na disku, zato bodo te datoteke, če ni ustreznih dovoljenj za obnovitev, izgubljene. +V kolikor se odločite te datoteke ohraniti, in so na voljo ustrezna dovoljenja, bodo spet usklajene s strežnikom. +Nasprotno, če potrdite izbris in niste lastnik datotek, te ne bodo več na voljo.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>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.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1255"/> <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. @@ -1431,7 +1442,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1450,17 +1461,6 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom? <translation>Odstrani vse datoteke</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>Vse datoteke v usklajevani mapi »%1« so bile na strežniku izbrisane. -Sprememba bo usklajena tudi s krajevno mapo na disku, zato bodo te datoteke, če ni ustreznih dovoljenj za obnovitev, izgubljene. -V kolikor se odločite te datoteke ohraniti, in so na voljo ustrezna dovoljenja, bodo spet usklajene s strežnikom. -Nasprotno, če potrdite izbris in niste lastnik datotek, te ne bodo več na voljo.</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>Ohrani datoteke</translation> @@ -1507,7 +1507,7 @@ Nasprotno, če potrdite izbris in niste lastnik datotek, te ne bodo več na volj <translation>Obstaja star dnevnik usklajevanja »%1«, ki pa ga ni mogoče odstraniti. Preverite, ali je datoteka morda v uporabi.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Obstaja star dnevnik usklajevanja »%1«, ki pa ga ni mogoče odstraniti. Preverite, ali je datoteka morda v uporabi.</translation> </message> @@ -2866,12 +2866,12 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation> <translation>Kot krajevne datoteke na ravni korenske mape v okolju Windows navidezne datoteke niso podprte. Izbrati je treba ustrezno podrejeno mapo na črkovnem pogonu.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>%1 mapa »%2« je usklajena s krajevno mapo »%3«</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>Uskladi mapo » %1 «</translation> </message> @@ -3369,14 +3369,24 @@ 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="490"/> + <source>permission</source> + <translation>dovoljenje</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>ID datoteke</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> + <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="946"/> @@ -4183,7 +4193,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Za iskalni niz »%1« ni zadetkov</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>Za iskalni niz »%1« ni zadetkov</translation> </message> @@ -4544,7 +4554,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <message> <location filename="../src/gui/sslerrordialog.cpp" line="158"/> <source>Additional errors:</source> - <translation type="unfinished"/> + <translation>Dodatne napake:</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="166"/> @@ -4798,16 +4808,16 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Imena datotek, ki vsebujejo končno piko, na tem sistemu niso podprta.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Ni mogoče odpreti ali ustvariti krajevne usklajevalne podatkovne zbirke. Prepričajte se, da imate ustrezna dovoljenja za pisanje v usklajevani mapi.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <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/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Ni mogoče odpreti ali ustvariti krajevne usklajevalne podatkovne zbirke. Prepričajte se, da imate ustrezna dovoljenja za pisanje v usklajevani mapi.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <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> @@ -4858,16 +4868,16 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Določanje stanja je spodletelo.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Kodni zapis imena datoteke ni veljaven.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Ni mogoče odpreti dnevnika usklajevanja</translation> @@ -4878,16 +4888,16 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Uporabljen je neveljaven znak; predmet »%1« je treba preimenovati.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation>Usklajevanje se bo v kratkem nadaljevalo.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <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/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation>Usklajevanje se bo v kratkem nadaljevalo.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -4936,7 +4946,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="169"/> <source>Some files could not be synced!</source> - <translation type="unfinished"/> + <translation>Nekaterih datotek ni mogoče uskladiti!</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="170"/> @@ -5039,22 +5049,22 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="373"/> <source>Failed to fetch providers.</source> - <translation type="unfinished"/> + <translation>Pridobivanje ponudnikov je spodletelo</translation> </message> <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="384"/> <source>Failed to fetch search providers for '%1'. Error: %2</source> - <translation type="unfinished"/> + <translation>Spodletelo je pridobivanje iskanja za '%1'. Napaka %2</translation> </message> <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="418"/> <source>Search has failed for '%2'.</source> - <translation type="unfinished"/> + <translation>Spodletelo je iskanje za '%2'.</translation> </message> <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="447"/> <source>Search has failed for '%1'. Error: %2</source> - <translation type="unfinished"/> + <translation>Spodletelo je iskanje za '%1'. Napaka: %2</translation> </message> </context> <context> @@ -5128,22 +5138,22 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="148"/> <source>User status feature is not supported. You will not be able to set your user status.</source> - <translation type="unfinished"/> + <translation>Funkcija statusa uporabnika ni podprta. Uporabniškega statusa ne boste mogli nastaviti.</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="152"/> <source>Emojis feature is not supported. Some user status functionality may not work.</source> - <translation type="unfinished"/> + <translation>Funkcija emotikonov ni podrprta. Nekatere funkcije statusa uporabnika morda ne bodo delovale.</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="156"/> <source>Could not set user status. Make sure you are connected to the server.</source> - <translation type="unfinished"/> + <translation>Ni mogoče nastaviti stanja uporabnika. Prepričajte se, da ste povezani s strežnikom.</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="160"/> <source>Could not clear user status message. Make sure you are connected to the server.</source> - <translation type="unfinished"/> + <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"/> @@ -5424,7 +5434,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <message> <location filename="../src/gui/owncloudgui.cpp" line="418"/> <source>Checking for changes in remote "%1"</source> - <translation type="unfinished"/> + <translation>Poteka preverjanje sprememb na oddaljenem mestu »%1«</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="419"/> @@ -5434,7 +5444,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <message> <location filename="../src/gui/owncloudgui.cpp" line="421"/> <source>Checking for changes in local "%1"</source> - <translation type="unfinished"/> + <translation>Poteka preverjanje za krajevne spremembe v »%1«</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="437"/> @@ -5827,9 +5837,9 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> - <translation type="unfinished"/> + <translation>Iskanje datotek, sporočil, dogodkov, ...</translation> </message> </context> <context> @@ -5837,7 +5847,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <message> <location filename="../src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml" line="24"/> <source>Load more results</source> - <translation type="unfinished"/> + <translation>Naloži več rezultatov</translation> </message> </context> <context> @@ -5845,7 +5855,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <message> <location filename="../src/gui/tray/UnifiedSearchResultItemSkeleton.qml" line="25"/> <source>Search result skeleton.</source> - <translation type="unfinished"/> + <translation>Rezultat iskanja skeleta.</translation> </message> </context> <context> @@ -5853,7 +5863,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <message> <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/> <source>Load more results</source> - <translation type="unfinished"/> + <translation>Naloži več rezultatov</translation> </message> </context> <context> @@ -5870,23 +5880,23 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Račun je povezan</translation> + <source>Current user status is online</source> + <translation>Trenutno je uporabnik povezan</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Račun ni povezan</translation> + <source>Current user status is do not disturb</source> + <translation>Trenutno uporabnik ne želi motenj</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Trenutno je uporabnik povezan</translation> + <source>Account connected</source> + <translation>Račun je povezan</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Trenutno uporabnik ne želi motenj</translation> + <source>Account not connected</source> + <translation>Račun ni povezan</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5899,7 +5909,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Odstrani račun</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Nastavi stanje</translation> </message> @@ -6057,12 +6067,12 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <message> <location filename="../src/common/checksums.cpp" line="367"/> <source>The checksum header contained an unknown checksum type "%1"</source> - <translation type="unfinished"/> + <translation>Zaglavje kontrolne vsote vsebuje neznan tip kontrolne vsote »%1«</translation> </message> <message> <location filename="../src/common/checksums.cpp" line="371"/> <source>The downloaded file does not match the checksum, it will be resumed. "%1" != "%2"</source> - <translation type="unfinished"/> + <translation>Prenesena datoteka ni skladna s kontrolno vsoto, zato bo prenos ponovljen. '%1' != '%2'</translation> </message> </context> <context> @@ -6090,7 +6100,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Ustavi usklajevanje za vse</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Nastavi stanje uporabnika</translation> </message> @@ -6190,9 +6200,9 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Odpri pogovorno okno souporabe</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> - <translation type="unfinished"/> + <translation>Poenoten seznam rezultatov iskanja</translation> </message> <message> <location filename="../src/gui/tray/Window.qml" line="720"/> @@ -6201,9 +6211,9 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Pokaži več možnosti</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> - <translation type="unfinished"/> + <translation>%1 - Dejavnost datoteke</translation> </message> </context> <context> @@ -6221,7 +6231,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <message> <location filename="../src/gui/main.cpp" line="45"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as "trayer" and try again.</source> - <translation type="unfinished"/> + <translation>%1 zahteva uporabo sistemske obvestilne vrstice. Pri uporabnikih namizja XFCE je treba upoštevati <a href="http://docs.xfce.org/xfce/xfce4-panel/systray"> ta navodila </a>. V nasprotnem primeru namestite aplikacijo za sistemsko obvestilno vrstico, kot je "trayer", in poskusite znova.</translation> </message> </context> <context> diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 7439b38e0..4073f7fd3 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -1346,13 +1346,6 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1412,7 +1405,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Чувај локалне фајлове као конфликтне</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1420,7 +1428,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1437,14 +1445,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1491,7 +1491,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Пронађен је стари журнал синхронизације „%1“ али се не може уклонити. Проверите да га нека апликација тренутно не користи.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2847,12 +2847,12 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3344,13 +3344,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4158,7 +4168,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Нема резултата за '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4773,16 +4783,16 @@ 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="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Не могу да отворим или креирам локалну базу за синхронизацију. Погледајте да ли имате право писања у синхронизационој фасцикли.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Имена фајлова која садрже карактер '%1' нису подржана на овом систему фајлова.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Не могу да отворим или креирам локалну базу за синхронизацију. Погледајте да ли имате право писања у синхронизационој фасцикли.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>Ово име фајла је резервисано на овом систему фајлова.</translation> @@ -4833,16 +4843,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stat није успео.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <source>Unable to read from the sync journal.</source> - <translation>Не могу да читам синхронизациони журнал.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="571"/> <source>Filename encoding is not valid</source> <translation>Кодирање назива фајла није исправно</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> + <translation>Не могу да читам синхронизациони журнал.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="643"/> <source>Cannot open the sync journal</source> <translation>Не могу да отворим журнал синхронизације</translation> @@ -4853,16 +4863,16 @@ 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="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>Назив садржи бар један недозвољен карактер</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Мало простора на диску: преузимања која би смањила слободно место испод %1 су прескочена.</translation> @@ -5802,7 +5812,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5845,22 +5855,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Налог повезан</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Налог повезан</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5874,7 +5884,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6065,7 +6075,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6165,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6176,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 968afd78a..d5c576c27 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -12,28 +12,28 @@ <message> <location filename="../src/gui/tray/ActivityItem.qml" line="31"/> <source>Open %1 locally</source> - <translation type="unfinished"/> + <translation>Öppna %1 lokalt</translation> </message> <message> <location filename="../src/gui/tray/ActivityItem.qml" line="251"/> <source>Open share dialog</source> - <translation type="unfinished"/> + <translation>Öppna delningsdialog</translation> </message> <message> <location filename="../src/gui/tray/ActivityItem.qml" line="255"/> <source>Share %1</source> - <translation type="unfinished"/> + <translation>Dela %1</translation> </message> <message> <location filename="../src/gui/tray/ActivityItem.qml" line="161"/> <location filename="../src/gui/tray/ActivityItem.qml" line="164"/> <source>Show more actions</source> - <translation type="unfinished"/> + <translation>Visa fler åtgärder</translation> </message> <message> <location filename="../src/gui/tray/ActivityItem.qml" line="240"/> <source>View activity</source> - <translation type="unfinished"/> + <translation>Visa aktivitet</translation> </message> </context> <context> @@ -41,7 +41,7 @@ <message> <location filename="../src/gui/tray/ActivityList.qml" line="24"/> <source>Activity list</source> - <translation type="unfinished"/> + <translation>Aktivitetslista</translation> </message> </context> <context> @@ -54,7 +54,7 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="122"/> <source>Checking for changes in "%1"</source> - <translation type="unfinished"/> + <translation>Söker efter ändringar i "%1"</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="122"/> @@ -144,7 +144,7 @@ <location filename="../src/common/filesystembase.cpp" line="398"/> <location filename="../src/common/filesystembase.cpp" line="404"/> <source>Could not move "%1" to "%2"</source> - <translation type="unfinished"/> + <translation>Kunde inte flytta "%1" till "%2"</translation> </message> <message> <location filename="../src/common/filesystembase.cpp" line="438"/> @@ -160,7 +160,7 @@ <message> <location filename="../src/libsync/filesystem.cpp" line="158"/> <source>Error removing "%1": %2</source> - <translation type="unfinished"/> + <translation>Kunde inte radera "%1": %2</translation> </message> <message> <location filename="../src/libsync/filesystem.cpp" line="158"/> @@ -170,7 +170,7 @@ <message> <location filename="../src/libsync/filesystem.cpp" line="174"/> <source>Could not remove folder "%1"</source> - <translation type="unfinished"/> + <translation>Kunde inte ta bort mappen "%1"</translation> </message> <message> <location filename="../src/libsync/filesystem.cpp" line="174"/> @@ -198,7 +198,7 @@ <message> <location filename="../src/gui/wizard/flow2authwidget.ui" line="56"/> <source>Logo</source> - <translation type="unfinished"/> + <translation>Logotyp</translation> </message> <message> <location filename="../src/gui/wizard/flow2authwidget.ui" line="65"/> @@ -208,7 +208,7 @@ <message> <location filename="../src/gui/wizard/flow2authwidget.ui" line="73"/> <source>Switch to your browser to connect your account</source> - <translation type="unfinished"/> + <translation>Använd din webläsare för att få åtkomst till ditt konto</translation> </message> <message> <location filename="../src/gui/wizard/flow2authwidget.ui" line="148"/> @@ -275,12 +275,12 @@ <message> <location filename="../src/libsync/abstractpropagateremotedeleteencrypted.cpp" line="139"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> - <translation type="unfinished"/> + <translation>Felaktig HTTP-kod i svaret från servern. '204' förväntades, men "%1 %2" mottogs.</translation> </message> <message> <location filename="../src/libsync/abstractpropagateremotedeleteencrypted.cpp" line="181"/> <source>"%1 Failed to unlock encrypted folder %2".</source> - <translation type="unfinished"/> + <translation>"%1 kunde inte låsa upp den krypterade mappen %2".</translation> </message> </context> <context> @@ -344,22 +344,22 @@ <message> <location filename="../src/gui/accountsettings.cpp" line="88"/> <source>End-to-End Encryption with Virtual Files</source> - <translation type="unfinished"/> + <translation>End-to-end-kryptering med virtuella filer</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="89"/> <source>You seem to have the Virtual Files feature enabled on this folder. At the moment, it is not possible to implicitly download virtual files that are End-to-End encrypted. To get the best experience with Virtual Files and End-to-End Encryption, make sure the encrypted folder is marked with "Make always available locally".</source> - <translation type="unfinished"/> + <translation>Det verkar som att funktionen "Virtuella filer" är aktiverad för denna mapp. För närvarande är det inte möjligt att uteslutande ladda ner virtuella filer med end-to-end-kryptering. För bästa upplevelse med virtuella filer och end-to-end-kryptering, säkerställ att "Gör alltid tillgänglig lokalt" är aktiverat.</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="97"/> <source>Don't encrypt folder</source> - <translation type="unfinished"/> + <translation>Kryptera inte mapp</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="100"/> <source>Encrypt folder</source> - <translation type="unfinished"/> + <translation>Kryptera mapp</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="233"/> @@ -428,12 +428,12 @@ Vänta på en ny synk, sedan kryptera den.</translation> <message> <location filename="../src/gui/accountsettings.cpp" line="354"/> <source>Encryption failed</source> - <translation type="unfinished"/> + <translation>Kryptering misslyckades</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="354"/> <source>Could not encrypt folder because the folder does not exist anymore</source> - <translation type="unfinished"/> + <translation>Kunde inte kryptera mappen eftersom den inte längre existerar</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="466"/> @@ -456,7 +456,7 @@ Vänta på en ny synk, sedan kryptera den.</translation> <location filename="../src/gui/accountsettings.cpp" line="494"/> <location filename="../src/gui/accountsettings.cpp" line="560"/> <source>Create new folder</source> - <translation type="unfinished"/> + <translation>Skapa ny mapp</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="500"/> @@ -502,12 +502,12 @@ Vänta på en ny synk, sedan kryptera den.</translation> <message> <location filename="../src/gui/accountsettings.cpp" line="602"/> <source>Enable virtual file support %1 …</source> - <translation type="unfinished"/> + <translation>Aktivera stöd för virtuella filer %1 …</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="602"/> <source>(experimental)</source> - <translation type="unfinished"/> + <translation>(experimentell)</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="695"/> @@ -601,12 +601,12 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/accountsettings.cpp" line="1108"/> <source>%1 as %2</source> - <translation type="unfinished"/> + <translation>%1 som %2</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="1115"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> - <translation type="unfinished"/> + <translation>Serverversion %1 stöds inte officiellt! Fortsätt på egen risk.</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="1117"/> @@ -646,7 +646,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/accountsettings.cpp" line="1151"/> <source>Server configuration error: %1 at %2.</source> - <translation type="unfinished"/> + <translation>Felaktig serverkonfiguration: %1 på %2.</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="1162"/> @@ -765,7 +765,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/addcertificatedialog.ui" line="35"/> <source>Certificate & Key (pkcs12):</source> - <translation type="unfinished"/> + <translation>Certifikat och nyckel (pkcs12) :</translation> </message> <message> <location filename="../src/gui/addcertificatedialog.ui" line="35"/> @@ -785,7 +785,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/addcertificatedialog.ui" line="79"/> <source>An encrypted pkcs12 bundle is strongly recommended as a copy will be stored in the configuration file.</source> - <translation type="unfinished"/> + <translation>En krypterad PKCS12-kedja är starkt rekommenderad då en kopia kommer att lagras i konfigurationsfilen.</translation> </message> <message> <location filename="../src/gui/addcertificatedialog.cpp" line="38"/> @@ -851,7 +851,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/authenticationdialog.cpp" line="32"/> <source>Enter username and password for "%1" at %2.</source> - <translation type="unfinished"/> + <translation>Ange användarnamn och lösenord för "%1" på %2.</translation> </message> <message> <location filename="../src/gui/authenticationdialog.cpp" line="32"/> @@ -1027,7 +1027,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/connectionvalidator.cpp" line="159"/> <source>Timeout</source> - <translation type="unfinished"/> + <translation>Timeout</translation> </message> <message> <location filename="../src/gui/connectionvalidator.cpp" line="159"/> @@ -1061,7 +1061,7 @@ This action will abort any currently running synchronization.</source> <location filename="../src/libsync/discoveryphase.cpp" line="497"/> <location filename="../src/libsync/discoveryphase.cpp" line="522"/> <source>Server error: PROPFIND reply is not XML formatted!</source> - <translation type="unfinished"/> + <translation>Serverfel: PROPFIND-svar är inte XML-formaterat!</translation> </message> </context> <context> @@ -1069,27 +1069,27 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Error while opening directory %1</source> - <translation type="unfinished"/> + <translation>Fel uppstod när mappen %1 öppnades</translation> </message> <message> <location filename="../src/libsync/discoveryphase.cpp" line="264"/> <source>Directory not accessible on client, permission denied</source> - <translation type="unfinished"/> + <translation>Mappen kan inte öppnas av klienten, åtkomst nekad</translation> </message> <message> <location filename="../src/libsync/discoveryphase.cpp" line="268"/> <source>Directory not found: %1</source> - <translation type="unfinished"/> + <translation>Mappen hittades inte: %1</translation> </message> <message> <location filename="../src/libsync/discoveryphase.cpp" line="299"/> <source>Filename encoding is not valid</source> - <translation type="unfinished"/> + <translation>Filnamnets teckenuppsättning är ogiltig</translation> </message> <message> <location filename="../src/libsync/discoveryphase.cpp" line="318"/> <source>Error while reading directory %1</source> - <translation type="unfinished"/> + <translation>Ett fel uppstod när mappen %1 skulle öppnas</translation> </message> </context> <context> @@ -1125,7 +1125,7 @@ Det kan vara problem med dina OpenSSL-bibliotek.</translation> <location filename="../src/gui/creds/flow2auth.cpp" line="118"/> <location filename="../src/gui/creds/flow2auth.cpp" line="226"/> <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> + <translation>Fel uppstod vid åtkomst till 'token'-endpoint: <br><em>%1</em></translation> </message> <message> <location filename="../src/gui/creds/flow2auth.cpp" line="121"/> @@ -1175,12 +1175,12 @@ Det kan vara problem med dina OpenSSL-bibliotek.</translation> <message> <location filename="../src/gui/wizard/flow2authwidget.cpp" line="221"/> <source>Reopen Browser</source> - <translation type="unfinished"/> + <translation>Öppna webbläsaren igen</translation> </message> <message> <location filename="../src/gui/wizard/flow2authwidget.cpp" line="224"/> <source>Copy Link</source> - <translation type="unfinished"/> + <translation>Kopiera länk</translation> </message> </context> <context> @@ -1225,13 +1225,13 @@ Det kan vara problem med dina OpenSSL-bibliotek.</translation> <message numerus="yes"> <location filename="../src/gui/folder.cpp" line="435"/> <source>%1 and %n other file(s) have been added.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%1 fil har lagts till.</numerusform><numerusform>%1 och %n ytterligare filer har lagts till.</numerusform></translation> </message> <message> <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> - <translation type="unfinished"/> + <translation>%1 har lagts till.</translation> </message> <message numerus="yes"> <location filename="../src/gui/folder.cpp" line="442"/> @@ -1348,13 +1348,6 @@ Det betyder att synkroniseringsklienten inte kan ladda upp lokala ändringar ome %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1414,7 +1407,22 @@ Om du fortsätter synkroniseringen kommer alla dina filer återställas med en <translation>Behåll lokala filer som konflikt</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1422,7 +1430,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1439,14 +1447,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Ta bort alla filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>Behåll filer</translation> @@ -1457,27 +1457,27 @@ If you decide to delete the files, they will be unavailable to you, unless you a <message> <location filename="../src/gui/foldercreationdialog.ui" line="14"/> <source>Create new folder</source> - <translation type="unfinished"/> + <translation>Skapa ny mapp</translation> </message> <message> <location filename="../src/gui/foldercreationdialog.ui" line="42"/> <source>Enter folder name</source> - <translation type="unfinished"/> + <translation>Ange mappens namn</translation> </message> <message> <location filename="../src/gui/foldercreationdialog.ui" line="61"/> <source>Folder already exists</source> - <translation type="unfinished"/> + <translation>Mappen existerar redan</translation> </message> <message> <location filename="../src/gui/foldercreationdialog.cpp" line="76"/> <source>Error</source> - <translation type="unfinished"/> + <translation>Fel</translation> </message> <message> <location filename="../src/gui/foldercreationdialog.cpp" line="76"/> <source>Could not create a folder! Check your write permissions.</source> - <translation type="unfinished"/> + <translation>Kunde inte skapa mappen! Kontrollera skrivrättigheterna.</translation> </message> </context> <context> @@ -1493,7 +1493,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>En gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -1535,7 +1535,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <message> <location filename="../src/gui/folderman.cpp" line="1489"/> <source>Sync finished with unresolved conflicts.</source> - <translation type="unfinished"/> + <translation>Synkroniseringen lyckades, men olösta konflikter uppstod.</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1491"/> @@ -1570,7 +1570,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <message> <location filename="../src/gui/folderman.cpp" line="1529"/> <source>The selected path does not exist!</source> - <translation type="unfinished"/> + <translation>Den valda sökvägen existerar inte!</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1533"/> @@ -1663,12 +1663,12 @@ If you decide to delete the files, they will be unavailable to you, unless you a <message> <location filename="../src/gui/folderstatusmodel.cpp" line="299"/> <source>Synchronizing VirtualFiles with local folder</source> - <translation type="unfinished"/> + <translation>Synkroniserar virtuella filer med lokal mapp</translation> </message> <message> <location filename="../src/gui/folderstatusmodel.cpp" line="301"/> <source>Synchronizing with local folder</source> - <translation type="unfinished"/> + <translation>Synkroniserar med lokal mapp</translation> </message> <message> <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> @@ -1688,7 +1688,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <message> <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> <source>Checking for changes in local "%1"</source> - <translation type="unfinished"/> + <translation>Söker efter ändringar i lokal '%1'</translation> </message> <message> <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> @@ -1848,7 +1848,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <message> <location filename="../src/gui/folderwizard.cpp" line="184"/> <source>Enter the name of the new folder to be created below "%1":</source> - <translation type="unfinished"/> + <translation>Ange namn på den mapp som ska placeras under "%1".</translation> </message> <message> <location filename="../src/gui/folderwizard.cpp" line="214"/> @@ -1897,23 +1897,23 @@ If you decide to delete the files, they will be unavailable to you, unless you a <location filename="../src/gui/folderwizard.cpp" line="512"/> <location filename="../src/gui/folderwizard.cpp" line="549"/> <source>Use virtual files instead of downloading content immediately %1</source> - <translation type="unfinished"/> + <translation>Använd virtuella filer istället för att ladda ner innehåll direkt %1</translation> </message> <message> <location filename="../src/gui/folderwizard.cpp" line="512"/> <location filename="../src/gui/folderwizard.cpp" line="549"/> <source>(experimental)</source> - <translation type="unfinished"/> + <translation>(experimentell)</translation> </message> <message> <location filename="../src/gui/folderwizard.cpp" line="545"/> <source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source> - <translation type="unfinished"/> + <translation>Windows stödjer inte virtuella filer direkt i rotkataloger. Välj en underkatalog.</translation> </message> <message> <location filename="../src/gui/folderwizard.cpp" line="563"/> <source>Virtual files are not available for the selected folder</source> - <translation type="unfinished"/> + <translation>Virtuella filer är inte tillgängliga för den valda mappen</translation> </message> </context> <context> @@ -1944,7 +1944,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <message> <location filename="../src/libsync/propagatedownload.cpp" line="213"/> <source>We received an unexpected download Content-Length.</source> - <translation type="unfinished"/> + <translation>Nerladdningens storlek är inkorrekt.</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="240"/> @@ -2079,7 +2079,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <message> <location filename="../src/gui/generalsettings.cpp" line="162"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> - <translation type="unfinished"/> + <translation>Du kan inte deaktivera autostart eftersom autostart är aktiverat på systemnivå.</translation> </message> <message> <location filename="../src/gui/generalsettings.cpp" line="310"/> @@ -2161,7 +2161,7 @@ Note that this selects only what pool upgrades are taken from, and that there ar <message> <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="111"/> <source>Reading from keychain failed with error: "%1"</source> - <translation type="unfinished"/> + <translation>Läsning från nyckelkedjan misslyckades med fel: "%1"</translation> </message> <message> <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="111"/> @@ -2256,7 +2256,7 @@ Objekt där radering är tillåtet raderas om de förhindrar att en mapp tas bor <message> <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to "%1".</source> - <translation type="unfinished"/> + <translation>Kunde inte spara ändringar av "%1".</translation> </message> <message> <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> @@ -2279,32 +2279,32 @@ Objekt där radering är tillåtet raderas om de förhindrar att en mapp tas bor <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="14"/> <source>Invalid filename</source> - <translation type="unfinished"/> + <translation>Ogiltigt filnamn</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="23"/> <source>The file could not be synced because it contains characters which are not allowed on this system.</source> - <translation type="unfinished"/> + <translation>Filen kunde inte synkroniseras då den innehåller tecken som är ogiltiga under detta system.</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="36"/> <source>Error</source> - <translation type="unfinished"/> + <translation>Fel</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="49"/> <source>Please enter a new name for the file:</source> - <translation type="unfinished"/> + <translation>Ange ett nytt namn för filen:</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.ui" line="62"/> <source>New filename</source> - <translation type="unfinished"/> + <translation>Nytt filnamn</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="85"/> <source>Rename file</source> - <translation type="unfinished"/> + <translation>Byt filnamn</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="87"/> @@ -2324,17 +2324,17 @@ Objekt där radering är tillåtet raderas om de förhindrar att en mapp tas bor <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/> <source>Filename contains illegal characters: %1</source> - <translation type="unfinished"/> + <translation>Filnamnet innehåller ogiltiga tecken: %1</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="158"/> <source>Could not rename file. Please make sure you are connected to the server.</source> - <translation type="unfinished"/> + <translation>Kunde inte byta namn på filen. Kontrollera anslutningen till servern.</translation> </message> <message> <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/> <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"/> + <translation>Kunde inte byta namn på filen eftersom filnamnet är upptaget. Ange ett annat filnamn.</translation> </message> </context> <context> @@ -2353,7 +2353,7 @@ Objekt där radering är tillåtet raderas om de förhindrar att en mapp tas bor <message> <location filename="../src/gui/legalnotice.cpp" line="55"/> <source><p>Copyright 2017-2021 Nextcloud GmbH<br />Copyright 2012-2021 ownCloud GmbH</p></source> - <translation type="unfinished"/> + <translation><p>Copyright 2017-2021 Nextcloud GmbH<br />Copyright 2012-2021 ownCloud GmbH</p></translation> </message> <message> <location filename="../src/gui/legalnotice.cpp" line="55"/> @@ -2573,7 +2573,7 @@ Loggar kommer att skrivas till %1</translation> <message> <location filename="../src/gui/networksettings.ui" line="176"/> <source>Note: proxy settings have no effects for accounts on localhost</source> - <translation type="unfinished"/> + <translation>Observera att proxy-inställningar inte används för konton på localhost</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="197"/> @@ -2661,7 +2661,7 @@ Loggar kommer att skrivas till %1</translation> <message> <location filename="../src/gui/creds/oauth.cpp" line="121"/> <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> + <translation>Tom JSON från OAuth2-ompekning</translation> </message> <message> <location filename="../src/gui/creds/oauth.cpp" line="126"/> @@ -2701,7 +2701,7 @@ ytterligare rättigheter under processen.</translation> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> <source>New %1 update ready</source> - <translation type="unfinished"/> + <translation>Ny %1-uppdatering redo</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> @@ -2746,12 +2746,12 @@ ytterligare rättigheter under processen.</translation> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please open <a href='%1'>%1</a> to download the update manually.</source> - <translation type="unfinished"/> + <translation>Kunde inte ladda ner uppdatering. Tryck på <a href='%1'>%1</a> för att ladda ner uppdateringen manuellt.</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="157"/> <source>Could not download update. Please open %1 to download the update manually.</source> - <translation type="unfinished"/> + <translation>Kunde inte ladda ner uppdateringen. Öppna %1 för att ladda ner uppdateringen manuellt.</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="159"/> @@ -2761,12 +2761,12 @@ ytterligare rättigheter under processen.</translation> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source> - <translation type="unfinished"/> + <translation>Ny %1 är tillgänglig. Öppna <a href='%2'>%2</a> för att ladda ner uppdateringen.</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="161"/> <source>New %1 is available. Please open %2 to download the update.</source> - <translation type="unfinished"/> + <translation>Ny %1 är tillgänglig. Öppna %2 för att ladda ner uppdateringen.</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> @@ -2804,7 +2804,7 @@ ytterligare rättigheter under processen.</translation> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="60"/> <source>Connect</source> - <translation type="unfinished"/> + <translation>Anslut</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="54"/> @@ -2821,7 +2821,7 @@ ytterligare rättigheter under processen.</translation> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="225"/> <source>(experimental)</source> - <translation type="unfinished"/> + <translation>(experimentell)</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> @@ -2846,17 +2846,17 @@ ytterligare rättigheter under processen.</translation> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="221"/> <source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source> - <translation type="unfinished"/> + <translation>Windows stödjer inte virtuella filer direkt i rotkataloger. Välj en underkatalog.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> - <translation type="unfinished"/> + <translation>Synkronisera mappen '%1'</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> @@ -2867,12 +2867,12 @@ ytterligare rättigheter under processen.</translation> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/> <source>%1 free space</source> <comment>%1 gets replaced with the size and a matching unit. Example: 3 MB or 5 GB</comment> - <translation type="unfinished"/> + <translation>%1 ledigt utrymme</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="359"/> <source>Virtual files are not available for the selected folder</source> - <translation type="unfinished"/> + <translation>Virtuella filer är inte tillgängliga för den valda mappen</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="419"/> @@ -3023,7 +3023,7 @@ Det är inte lämpligt att använda den.</translation> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="237"/> <source>Server address does not seem to be valid</source> - <translation type="unfinished"/> + <translation>Serverns adress verkar var ogiltig</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="293"/> @@ -3101,7 +3101,7 @@ Det är inte lämpligt att använda den.</translation> <message> <location filename="../src/gui/owncloudsetupwizard.cpp" line="470"/> <source>OK</source> - <translation type="unfinished"/> + <translation>OK</translation> </message> <message> <location filename="../src/gui/owncloudsetupwizard.cpp" line="472"/> @@ -3237,7 +3237,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="436"/> <source>Stay safe</source> - <translation type="unfinished"/> + <translation>Var försiktig</translation> </message> </context> <context> @@ -3253,52 +3253,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <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"/> + <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 type="unfinished"/> + <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="250"/> <source>Symbolic links are not supported in syncing.</source> - <translation type="unfinished"/> + <translation>Symboliska länkar kan ej synkroniseras.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="258"/> <source>File is listed on the ignore list.</source> - <translation type="unfinished"/> + <translation>Filen är listad i undantagslistan.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File names ending with a period are not supported on this file system.</source> - <translation type="unfinished"/> + <translation>Filnamn som slutar med en punkt stöds inte på detta filsystem.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="272"/> <source>File names containing the character '%1' are not supported on this file system.</source> - <translation type="unfinished"/> + <translation>Filnamn innehållandes tecknet "%1' stöds inte på detta filsystem.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="315"/> <source>File names containing the character "%1" are not supported on this file system.</source> - <translation type="unfinished"/> + <translation>ilnamn innehållandes tecknet "%1"' stöds inte på detta filsystem.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="276"/> <source>File name contains at least one invalid character</source> - <translation type="unfinished"/> + <translation>Filnamnet innehåller minst ett ogiltigt tecken</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="278"/> <source>The file name is a reserved name on this file system.</source> - <translation type="unfinished"/> + <translation>Detta filnamn är reserverat på detta filsystem.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="284"/> <source>Filename contains trailing spaces.</source> - <translation type="unfinished"/> + <translation>Filnamnet innehåller inledande blanksteg.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="288"/> @@ -3308,7 +3308,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/discovery.cpp" line="292"/> <source>File/Folder is ignored because it's hidden.</source> - <translation type="unfinished"/> + <translation>Filen/mappen ignoreras eftersom den är dold.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="295"/> @@ -3323,17 +3323,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/discovery.cpp" line="302"/> <source>The filename cannot be encoded on your file system.</source> - <translation type="unfinished"/> + <translation>Filnamnet kan inte avkodas på ditt filsystem.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="305"/> <source>The filename is blacklisted on the server.</source> - <translation type="unfinished"/> + <translation>Filnamnet är svartlistat på servern.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="371"/> <source>File has extension reserved for virtual files.</source> - <translation type="unfinished"/> + <translation>Filens ändelse är reserverad för virtuella filer.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="446"/> @@ -3346,14 +3346,24 @@ 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="490"/> + <source>permission</source> + <translation>behörighet</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> - <translation type="unfinished"/> + <translation>fil-ID</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation type="unfinished"/> + <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="946"/> @@ -3398,12 +3408,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/discovery.cpp" line="1378"/> <source>Not allowed to remove, restoring</source> - <translation type="unfinished"/> + <translation>Borttagning tillåts ej, återställer</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="1487"/> <source>Error while reading the database</source> - <translation type="unfinished"/> + <translation>Fel uppstod när databasen skulle läsas</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="1548"/> @@ -3426,12 +3436,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/owncloudpropagator.cpp" line="1025"/> <source>Error updating metadata: %1</source> - <translation type="unfinished"/> + <translation>Ett fel uppstod när metadata skulle uppdateras: %1</translation> </message> <message> <location filename="../src/libsync/owncloudpropagator.cpp" line="1029"/> <source>File is currently in use</source> - <translation type="unfinished"/> + <translation>Filen används</translation> </message> </context> <context> @@ -3511,7 +3521,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagatedownload.cpp" line="1099"/> <source>The file %1 is currently in use</source> - <translation type="unfinished"/> + <translation>Filen %1 används för tillfället</translation> </message> </context> <context> @@ -3542,7 +3552,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/> <source>Could not create folder %1</source> - <translation type="unfinished"/> + <translation>Kunde inte skapa mappen %1</translation> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="181"/> @@ -3557,7 +3567,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagatorjobs.cpp" line="197"/> <source>The file %1 is currently in use</source> - <translation type="unfinished"/> + <translation>Filen %1 används för tillfället</translation> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="193"/> @@ -3603,7 +3613,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagatorjobs.cpp" line="265"/> <source>The file %1 is currently in use</source> - <translation type="unfinished"/> + <translation>Filen %1 används för tillfället</translation> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> @@ -3614,7 +3624,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagatorjobs.cpp" line="271"/> <source>Failed to rename file</source> - <translation type="unfinished"/> + <translation>Kunde inte döpa om filen</translation> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="277"/> @@ -3658,7 +3668,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagateremotemkdir.cpp" line="267"/> <source>The file %1 is currently in use</source> - <translation type="unfinished"/> + <translation>Filen %1 används för tillfället</translation> </message> </context> <context> @@ -3681,7 +3691,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagateremotemove.cpp" line="260"/> <source>The file %1 is currently in use</source> - <translation type="unfinished"/> + <translation>Filen %1 används för tillfället</translation> </message> <message> <location filename="../src/libsync/propagateremotemove.cpp" line="265"/> @@ -3699,7 +3709,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagateupload.cpp" line="242"/> <source>Failed to upload encrypted file.</source> - <translation type="unfinished"/> + <translation>Kunde inte ladda upp krypterad fil.</translation> </message> <message> <location filename="../src/libsync/propagateupload.cpp" line="273"/> @@ -3730,7 +3740,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagateupload.cpp" line="420"/> <source>Failed to unlock encrypted folder.</source> - <translation type="unfinished"/> + <translation>Kunde inte låsa upp krypterad mapp.</translation> </message> <message> <location filename="../src/libsync/propagateupload.cpp" line="769"/> @@ -3745,7 +3755,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagateupload.cpp" line="773"/> <source>The file %1 is currently in use</source> - <translation type="unfinished"/> + <translation>Filen %1 används för tillfället</translation> </message> </context> <context> @@ -3961,7 +3971,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sharedialog.cpp" line="300"/> <source>The file cannot be shared because it does not have sharing permission.</source> - <translation type="unfinished"/> + <translation>Filen kunde inte delas då den saknar delningsrättigheter.</translation> </message> <message> <location filename="../src/gui/sharedialog.cpp" line="366"/> @@ -3994,7 +4004,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sharelinkwidget.ui" line="146"/> <source>Note</source> - <translation type="unfinished"/> + <translation>Anteckning</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.ui" line="171"/> @@ -4004,7 +4014,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sharelinkwidget.ui" line="223"/> <source>Set password</source> - <translation type="unfinished"/> + <translation>Ange lösenord</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.ui" line="239"/> @@ -4019,7 +4029,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sharelinkwidget.ui" line="294"/> <source>Expires</source> - <translation type="unfinished"/> + <translation>Upphör</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="150"/> @@ -4054,7 +4064,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sharelinkwidget.cpp" line="193"/> <source>View only</source> - <translation type="unfinished"/> + <translation>Skrivskyddad</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="198"/> @@ -4079,7 +4089,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sharelinkwidget.cpp" line="222"/> <source>Link name</source> - <translation type="unfinished"/> + <translation>Länknamn</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="218"/> @@ -4099,7 +4109,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sharelinkwidget.cpp" line="305"/> <source>Delete link</source> - <translation type="unfinished"/> + <translation>Ta bort länk</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> @@ -4160,19 +4170,19 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Inga resultat för '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> - <translation type="unfinished"/> + <translation>Inga resultat för "%1"</translation> </message> <message> <location filename="../src/gui/shareusergroupwidget.cpp" line="391"/> <source>Password for share required</source> - <translation type="unfinished"/> + <translation>Lösenord krävs för delning</translation> </message> <message> <location filename="../src/gui/shareusergroupwidget.cpp" line="392"/> <source>Please enter a password for your email share:</source> - <translation type="unfinished"/> + <translation>Ange ett lösenord för att dela via e-post:</translation> </message> <message> <location filename="../src/gui/shareusergroupwidget.cpp" line="449"/> @@ -4195,22 +4205,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/shareuserline.ui" line="97"/> <source>Can edit</source> - <translation type="unfinished"/> + <translation>Kan redigeras</translation> </message> <message> <location filename="../src/gui/shareuserline.ui" line="131"/> <source>Note:</source> - <translation type="unfinished"/> + <translation>Anteckning:</translation> </message> <message> <location filename="../src/gui/shareuserline.ui" line="187"/> <source>Password:</source> - <translation type="unfinished"/> + <translation>Lösenord:</translation> </message> <message> <location filename="../src/gui/shareuserline.ui" line="259"/> <source>Expires:</source> - <translation type="unfinished"/> + <translation>Förfaller:</translation> </message> <message> <location filename="../src/gui/shareusergroupwidget.cpp" line="516"/> @@ -4220,12 +4230,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/shareusergroupwidget.cpp" line="528"/> <source>Note to recipient</source> - <translation type="unfinished"/> + <translation>Notering till mottagare</translation> </message> <message> <location filename="../src/gui/shareusergroupwidget.cpp" line="542"/> <source>Set expiration date</source> - <translation type="unfinished"/> + <translation>Välj utgångsdatum</translation> </message> <message> <location filename="../src/gui/shareusergroupwidget.cpp" line="558"/> @@ -4250,7 +4260,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/shareusergroupwidget.cpp" line="588"/> <source>Password protect</source> - <translation type="unfinished"/> + <translation>Lösenordsskydda</translation> </message> </context> <context> @@ -4294,7 +4304,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <location filename="../src/gui/socketapi/socketapi.cpp" line="994"/> <location filename="../src/gui/socketapi/socketapi.cpp" line="1137"/> <source>Activity</source> - <translation type="unfinished"/> + <translation>Aktivitet</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="920"/> @@ -4314,7 +4324,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/socketapi.cpp" line="948"/> <source>Resharing this folder is not allowed</source> - <translation type="unfinished"/> + <translation>Vidaredelning av denna mapp är inte tillåtet</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="962"/> @@ -4521,7 +4531,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sslerrordialog.cpp" line="158"/> <source>Additional errors:</source> - <translation type="unfinished"/> + <translation>Ytterligare fel:</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="166"/> @@ -4679,7 +4689,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/syncengine.cpp" line="355"/> <source>Could not update file: %1</source> - <translation type="unfinished"/> + <translation>Kunde inte uppdatera filen: %1</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="365"/> @@ -4775,16 +4785,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Filnamn som slutar med punkt stöds inte i det här filsystemet.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Kunde inte öppna eller återskapa den lokala synkroniseringsdatabasen. Säkerställ att du har skrivrättigheter till synkroniseringsmappen.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Filnamn som innehåller tecknet '%1' stöds inte i det här filsystemet.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Kunde inte öppna eller återskapa den lokala synkroniseringsdatabasen. Säkerställ att du har skrivrättigheter till synkroniseringsmappen.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>Filnamnet är ett reserverat namn i detta filsystemet.</translation> @@ -4835,16 +4845,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Stat misslyckades.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Filnamnskodning är inte giltig</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Det går inte att öppna synkroniseringsjournalen</translation> @@ -4855,16 +4865,16 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Otillåtna tecken, var vänlig byt namn på "%1"</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <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/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <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> @@ -4881,44 +4891,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <location filename="../src/gui/tray/syncstatussummary.cpp" line="124"/> <location filename="../src/gui/tray/syncstatussummary.cpp" line="313"/> <source>Offline</source> - <translation type="unfinished"/> + <translation>Offline</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="138"/> <location filename="../src/gui/tray/syncstatussummary.cpp" line="316"/> <location filename="../src/gui/tray/syncstatussummary.h" line="89"/> <source>All synced!</source> - <translation type="unfinished"/> + <translation>Färdigsynkroniserat!</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="147"/> <source>Some files couldn't be synced!</source> - <translation type="unfinished"/> + <translation>Vissa filer kunde inte synkroniseras!</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="148"/> <source>See below for errors</source> - <translation type="unfinished"/> + <translation>Se nedan för felmeddelanden</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="155"/> <source>Syncing</source> - <translation type="unfinished"/> + <translation>Synkroniserar</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="162"/> <source>Sync paused</source> - <translation type="unfinished"/> + <translation>Synkronisering pausad</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="169"/> <source>Some files could not be synced!</source> - <translation type="unfinished"/> + <translation>Vissa filer kunde inte synkroniseras!</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="170"/> <source>See below for warnings</source> - <translation type="unfinished"/> + <translation>Se nedan för felmeddelanden</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="218"/> @@ -4928,12 +4938,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="222"/> <source>%1 of %2</source> - <translation type="unfinished"/> + <translation>%1 av %2</translation> </message> <message> <location filename="../src/gui/tray/syncstatussummary.cpp" line="227"/> <source>Syncing file %1 of %2</source> - <translation type="unfinished"/> + <translation>Synkroniserar fil %1 av %2</translation> </message> </context> <context> @@ -5016,7 +5026,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="373"/> <source>Failed to fetch providers.</source> - <translation type="unfinished"/> + <translation>Kunde inte hämta leverantörer</translation> </message> <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="384"/> @@ -5026,12 +5036,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="418"/> <source>Search has failed for '%2'.</source> - <translation type="unfinished"/> + <translation>Sökningen "%2' misslyckades.</translation> </message> <message> <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="447"/> <source>Search has failed for '%1'. Error: %2</source> - <translation type="unfinished"/> + <translation>Sökningen "%1'. Fel: %2.</translation> </message> </context> <context> @@ -5095,96 +5105,96 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="140"/> <source>Could not fetch predefined statuses. Make sure you are connected to the server.</source> - <translation type="unfinished"/> + <translation>Kunde inte hämta fördefinierade statusar. Kontrollera anslutningen till servern.</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="144"/> <source>Could not fetch user status. Make sure you are connected to the server.</source> - <translation type="unfinished"/> + <translation>Kunde inte hämta användarstatus. Kontrollera anslutningen till servern.</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="148"/> <source>User status feature is not supported. You will not be able to set your user status.</source> - <translation type="unfinished"/> + <translation>Användarstatus stöds inte. Du kommer inte att kunna välja status.</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="152"/> <source>Emojis feature is not supported. Some user status functionality may not work.</source> - <translation type="unfinished"/> + <translation>Emojis stöds inte. Viss statusfunktionalitet kan vara otillgänglig.</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="156"/> <source>Could not set user status. Make sure you are connected to the server.</source> - <translation type="unfinished"/> + <translation>Kunde inte välja status. Kontrollera anslutningen till servern.</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="160"/> <source>Could not clear user status message. Make sure you are connected to the server.</source> - <translation type="unfinished"/> + <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"/> <source>Don't clear</source> - <translation type="unfinished"/> + <translation>Rensa inte</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="361"/> <source>30 minutes</source> - <translation type="unfinished"/> + <translation>30 minuter</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="364"/> <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/> <source>1 hour</source> - <translation type="unfinished"/> + <translation>1 timme</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="367"/> <source>4 hours</source> - <translation type="unfinished"/> + <translation>4 timmar</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="370"/> <location filename="../src/gui/userstatusselectormodel.cpp" line="445"/> <source>Today</source> - <translation type="unfinished"/> + <translation>Idag</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="373"/> <location filename="../src/gui/userstatusselectormodel.cpp" line="447"/> <source>This week</source> - <translation type="unfinished"/> + <translation>Denna vecka</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="405"/> <source>Less than a minute</source> - <translation type="unfinished"/> + <translation>Mindre än en minut</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="409"/> <source>1 minute</source> - <translation type="unfinished"/> + <translation>1 minut</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="411"/> <source>%1 minutes</source> - <translation type="unfinished"/> + <translation>%1 minuier</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="418"/> <source>%1 hours</source> - <translation type="unfinished"/> + <translation>%1 timmar</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/> <source>1 day</source> - <translation type="unfinished"/> + <translation>1 dag</translation> </message> <message> <location filename="../src/gui/userstatusselectormodel.cpp" line="425"/> <source>%1 days</source> - <translation type="unfinished"/> + <translation>%1 dagar</translation> </message> </context> <context> @@ -5192,7 +5202,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/common/vfs.cpp" line="74"/> <source>The Virtual filesystem feature requires a NTFS file system, %1 is using %2</source> - <translation type="unfinished"/> + <translation>Det virtuella filsystemet kräver ett NTFS-filsystem, %1 använder %2</translation> </message> </context> <context> @@ -5218,7 +5228,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/creds/webflowcredentials.cpp" line="165"/> <source>You have been logged out of %1 as user %2. Please login again.</source> - <translation type="unfinished"/> + <translation>Du har blivit utloggad från %1 av användaren %2. Logga in igen.</translation> </message> <message> <location filename="../src/gui/creds/webflowcredentials.cpp" line="189"/> @@ -5231,43 +5241,43 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/wizard/welcomepage.ui" line="20"/> <source>Form</source> - <translation type="unfinished"/> + <translation>Formulär</translation> </message> <message> <location filename="../src/gui/wizard/welcomepage.ui" line="143"/> <location filename="../src/gui/wizard/welcomepage.cpp" line="89"/> <source>Log in to your %1</source> - <translation type="unfinished"/> + <translation>Logga in till din %1</translation> </message> <message> <location filename="../src/gui/wizard/welcomepage.ui" line="156"/> <source>Create account with Provider</source> - <translation type="unfinished"/> + <translation>Skapa konto med leverantör</translation> </message> <message> <location filename="../src/gui/wizard/welcomepage.cpp" line="68"/> <source>Keep your data secure and under your control</source> - <translation type="unfinished"/> + <translation>Håll din data säker och under din kontroll</translation> </message> <message> <location filename="../src/gui/wizard/welcomepage.cpp" line="69"/> <source>Secure collaboration & file exchange</source> - <translation type="unfinished"/> + <translation>Säkert samarbete & filöverföringar</translation> </message> <message> <location filename="../src/gui/wizard/welcomepage.cpp" line="70"/> <source>Easy-to-use web mail, calendaring & contacts</source> - <translation type="unfinished"/> + <translation>Simpel e-post-, kalender- och kontakthantering</translation> </message> <message> <location filename="../src/gui/wizard/welcomepage.cpp" line="71"/> <source>Screensharing, online meetings & web conferences</source> - <translation type="unfinished"/> + <translation>Skärmdelning, onlinemöten och webkonferenser</translation> </message> <message> <location filename="../src/gui/wizard/welcomepage.cpp" line="114"/> <source>Host your own server</source> - <translation type="unfinished"/> + <translation>Körs direkt från din egen dator</translation> </message> </context> <context> @@ -5411,7 +5421,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/owncloudgui.cpp" line="421"/> <source>Checking for changes in local "%1"</source> - <translation type="unfinished"/> + <translation>Söker efter ändringar i lokala "%1"</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="437"/> @@ -5530,12 +5540,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="121"/> <source>User name</source> - <translation type="unfinished"/> + <translation>Användarnamn</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/> <source>Server address</source> - <translation type="unfinished"/> + <translation>Serveradress</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="148"/> @@ -5550,7 +5560,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="175"/> <source>Sync Logo</source> - <translation type="unfinished"/> + <translation>Synkroniseringslogo</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="225"/> @@ -5560,17 +5570,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="244"/> <source>Local Folder</source> - <translation type="unfinished"/> + <translation>Lokal mapp</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="408"/> <source>Synchronize everything from server</source> - <translation type="unfinished"/> + <translation>Synkronisera allt från servern</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="464"/> <source>Ask before syncing folders larger than</source> - <translation type="unfinished"/> + <translation>Fråga innan synkronisering av mappar större än</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="490"/> @@ -5581,7 +5591,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="533"/> <source>Ask before syncing external storages</source> - <translation type="unfinished"/> + <translation>Fråga innan synkronisering av externa enheter</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="576"/> @@ -5606,7 +5616,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="714"/> <source>Keep local data</source> - <translation type="unfinished"/> + <translation>Behåll lokal data</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="730"/> @@ -5616,7 +5626,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="733"/> <source>Erase local folder and start a clean sync</source> - <translation type="unfinished"/> + <translation>Radera lokal mapp och starta en fräsch synkronisering</translation> </message> </context> <context> @@ -5661,17 +5671,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="353"/> <source>TextLabel</source> - <translation type="unfinished"/> + <translation>Textetikett</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="73"/> <source>Logo</source> - <translation type="unfinished"/> + <translation>Logotyp</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="183"/> <source>Server address</source> - <translation type="unfinished"/> + <translation>Serveradress</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="194"/> @@ -5686,7 +5696,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="259"/> <source>This is the link to your %1 web interface when you open it in the browser.</source> - <translation type="unfinished"/> + <translation>Länken %1 används för att nå ditt webgränssnitt i din webläsare.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="343"/> @@ -5714,7 +5724,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/foldercreationdialog.cpp" line="41"/> <source>New folder</source> - <translation type="unfinished"/> + <translation>Ny mapp</translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="472"/> @@ -5775,22 +5785,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/userstatus.cpp" line="53"/> <source>Away</source> - <translation type="unfinished"/> + <translation>Borta</translation> </message> <message> <location filename="../src/gui/userstatus.cpp" line="55"/> <source>Do not disturb</source> - <translation type="unfinished"/> + <translation>Stör ej</translation> </message> <message> <location filename="../src/gui/userstatus.cpp" line="58"/> <source>Offline</source> - <translation type="unfinished"/> + <translation>Offline</translation> </message> <message> <location filename="../src/gui/userstatus.cpp" line="60"/> <source>Online</source> - <translation type="unfinished"/> + <translation>Online</translation> </message> </context> <context> @@ -5798,15 +5808,15 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/common/syncjournaldb.cpp" line="975"/> <source>Failed to connect database.</source> - <translation type="unfinished"/> + <translation>Kunde inte koppla mot databasen.</translation> </message> </context> <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> - <translation type="unfinished"/> + <translation>Sök efter filer, meddelanden, händelser...</translation> </message> </context> <context> @@ -5814,7 +5824,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml" line="24"/> <source>Load more results</source> - <translation type="unfinished"/> + <translation>Visa fler resultat</translation> </message> </context> <context> @@ -5830,7 +5840,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="37"/> <source>Load more results</source> - <translation type="unfinished"/> + <translation>Visa fler resultat</translation> </message> </context> <context> @@ -5847,23 +5857,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Konto anslutet</translation> + <source>Current user status is online</source> + <translation>Användarens status är "Online"</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Konto inte anslutet</translation> + <source>Current user status is do not disturb</source> + <translation>Användarens status är "Stör ej"</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Konto anslutet</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation type="unfinished"/> + <source>Account not connected</source> + <translation>Konto inte anslutet</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5876,9 +5886,9 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ta bort konto</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> - <translation type="unfinished"/> + <translation>Välj status</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="192"/> @@ -5903,52 +5913,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/UserStatusSelector.qml" line="38"/> <source>Online status</source> - <translation type="unfinished"/> + <translation>Status</translation> </message> <message> <location filename="../src/gui/UserStatusSelector.qml" line="55"/> <source>Online</source> - <translation type="unfinished"/> + <translation>Online</translation> </message> <message> <location filename="../src/gui/UserStatusSelector.qml" line="65"/> <source>Away</source> - <translation type="unfinished"/> + <translation>Borta</translation> </message> <message> <location filename="../src/gui/UserStatusSelector.qml" line="76"/> <source>Do not disturb</source> - <translation type="unfinished"/> + <translation>Stör ej</translation> </message> <message> <location filename="../src/gui/UserStatusSelector.qml" line="86"/> <source>Invisible</source> - <translation type="unfinished"/> + <translation>Osynlig</translation> </message> <message> <location filename="../src/gui/UserStatusSelector.qml" line="99"/> <source>Status message</source> - <translation type="unfinished"/> + <translation>Statusmeddelande</translation> </message> <message> <location filename="../src/gui/UserStatusSelector.qml" line="137"/> <source>What is your status?</source> - <translation type="unfinished"/> + <translation>Vad är din status?</translation> </message> <message> <location filename="../src/gui/UserStatusSelector.qml" line="165"/> <source>Clear status message after</source> - <translation type="unfinished"/> + <translation>Rensa status efter</translation> </message> <message> <location filename="../src/gui/UserStatusSelector.qml" line="182"/> <source>Clear status message</source> - <translation type="unfinished"/> + <translation>Rensa status</translation> </message> <message> <location filename="../src/gui/UserStatusSelector.qml" line="188"/> <source>Set status message</source> - <translation type="unfinished"/> + <translation>Välj status</translation> </message> </context> <context> @@ -6067,9 +6077,9 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Pausa synkronisering för alla</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> - <translation type="unfinished"/> + <translation>Välj användarstatus</translation> </message> <message> <location filename="../src/gui/tray/Window.qml" line="203"/> @@ -6099,12 +6109,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/tray/Window.qml" line="356"/> <source>Current user status is online</source> - <translation type="unfinished"/> + <translation>Användarens status är "Online"</translation> </message> <message> <location filename="../src/gui/tray/Window.qml" line="356"/> <source>Current user status is do not disturb</source> - <translation type="unfinished"/> + <translation>Användarens status är "Stör ej"</translation> </message> <message> <location filename="../src/gui/tray/Window.qml" line="816"/> @@ -6167,9 +6177,9 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Öppna delningsdialogen</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> - <translation type="unfinished"/> + <translation>Sammanlagda sökresultat</translation> </message> <message> <location filename="../src/gui/tray/Window.qml" line="720"/> @@ -6178,9 +6188,9 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Visa fler åtgärder</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> - <translation type="unfinished"/> + <translation>%1 - filhändelser</translation> </message> </context> <context> @@ -6564,22 +6574,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/userstatus.cpp" line="55"/> <source>Away</source> - <translation type="unfinished"/> + <translation>Borta</translation> </message> <message> <location filename="../src/gui/userstatus.cpp" line="57"/> <source>Do not disturb</source> - <translation type="unfinished"/> + <translation>Stör ej</translation> </message> <message> <location filename="../src/gui/userstatus.cpp" line="60"/> <source>Offline</source> - <translation type="unfinished"/> + <translation>Offline</translation> </message> <message> <location filename="../src/gui/userstatus.cpp" line="62"/> <source>Online</source> - <translation type="unfinished"/> + <translation>Online</translation> </message> </context> <context> @@ -6587,7 +6597,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/vfs/cfapi/vfs_cfapi.cpp" line="333"/> <source>Download of end-to-end encrypted file failed</source> - <translation type="unfinished"/> + <translation>Nerladdning via end-to-end-kryptering misslyckades</translation> </message> <message> <location filename="../src/libsync/vfs/cfapi/vfs_cfapi.cpp" line="334"/> diff --git a/translations/client_th.ts b/translations/client_th.ts index c7c923480..ec56c6bce 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -1342,13 +1342,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1403,7 +1396,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>เก็บไฟล์ในเครื่องเป็นข้อขัดแย้ง</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1411,7 +1419,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1428,14 +1436,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1482,7 +1482,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>บนบันทึกการประสานข้อมูลเก่า '%1' แต่ไม่สามารถลบออกได้ กรุณาตรวจสอบให้แน่ใจว่าไม่มีแอพฯ หรือการทำงานใดๆที่ใช้มันอยู่</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2833,12 +2833,12 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3329,13 +3329,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4143,7 +4153,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ไม่มีผลลัพธ์สำหรับ '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4756,17 +4766,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="507"/> + <source>File names containing the character '%1' are not supported on this file system.</source> + <translation>ชื่อไฟล์ที่มีตัวอักษร '%1' ยังไม่ได้รับการสนับสนุนบนระบบไฟล์นี้</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="501"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation> ไม่สามารถเปิดหรือสร้างฐานข้อมูลการประสานข้อมูลในเครื่อง ตรวจสอบว่าคุณมีสิทธิ์การเขียนในโฟลเดอร์ซิงค์</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="507"/> - <source>File names containing the character '%1' are not supported on this file system.</source> - <translation>ชื่อไฟล์ที่มีตัวอักษร '%1' ยังไม่ได้รับการสนับสนุนบนระบบไฟล์นี้</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>ชื่อไฟล์นี้เป็นชื่อที่ถูกสงวนไว้</translation> @@ -4817,16 +4827,16 @@ 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="560"/> - <source>Unable to read from the sync journal.</source> - <translation>ไม่สามารถอ่านจากบันทึกการประสานข้อมูล</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="571"/> <source>Filename encoding is not valid</source> <translation>การเข้ารหัสชื่อไฟล์ไม่ถูกต้อง</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> + <translation>ไม่สามารถอ่านจากบันทึกการประสานข้อมูล</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="643"/> <source>Cannot open the sync journal</source> <translation>ไม่สามารถเปิดการผสานข้อมูลเจอร์นัล</translation> @@ -4837,16 +4847,16 @@ 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="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>มีชื่อแฟ้มอย่างน้อยหนึ่งตัวอักษรที่ไม่ถูกต้อง</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>พื้นที่จัดเก็บเหลือน้อย: การดาวน์โหลดจะช่วยลดพื้นที่ว่างด้านล่าง %1 ที่ถูกข้ามไป</translation> @@ -5786,7 +5796,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5829,22 +5839,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> + <source>Current user status is online</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> + <source>Account connected</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5858,7 +5868,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6049,7 +6059,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6149,7 +6159,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6160,7 +6170,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 5bde112d8..15b2ab141 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -1350,16 +1350,6 @@ This means that the synchronization client might not upload local changes immedi Bunun sonucunda eşitleme istemcisi yerel değişiklikleri anında yükleyemez. Onun yerine yalnız yerel değişiklikleri tarar ve aralıklarla yükler (varsayılan olarak iki saatte bir).</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>'%1' eşitleme klasöründeki tüm dosyalar sunucudan silindi. -Silinen dosyalar eşitleme sırasında yerel eşitleme klasörünüzden de silinecek ve bu dosyaları geri yüklemedikçe göremeyeceksiniz. -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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1419,7 +1409,28 @@ Eşitlemeye normal şekilde devam edilirse tüm dosyalar daha eski bir dosya ile <translation>Çakıştığında yerel dosyalar korunsun</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>'%1' eşitleme klasöründeki tüm dosyalar silinecek. +Silinen bu dosyalar yerel eşitleme klasörünüzden de silineceğinden, geri yükleme yetkiniz yoksa bu dosyaları kullanamayacaksınız. +Geri yükleme yetkiniz varsa ve geri yüklemeyi seçerseniz, dosyalar sunucu ile yeniden eşitlenir. +Silmeyi seçerseniz, sahibi değilseniz bu dosyaları artık kullanamazsınız.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>'%1' eşitleme klasöründeki tüm dosyalar sunucudan silindi. +Silinen dosyalar eşitleme sırasında yerel eşitleme klasörünüzden de silinecek ve bu dosyaları geri yüklemedikçe göremeyeceksiniz. +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="1255"/> <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. @@ -1430,7 +1441,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1450,17 +1461,6 @@ Bu işlemi yanlışlıkla yaptıysanız ve dosyalarınızı korumak istiyorsanı <translation>Tüm dosyalar silinsin</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>'%1' eşitleme klasöründeki tüm dosyalar silinecek. -Silinen bu dosyalar yerel eşitleme klasörünüzden de silineceğinden, geri yükleme yetkiniz yoksa bu dosyaları kullanamayacaksınız. -Geri yükleme yetkiniz varsa ve geri yüklemeyi seçerseniz, dosyalar sunucu ile yeniden eşitlenir. -Silmeyi seçerseniz, sahibi değilseniz bu dosyaları artık kullanamazsınız.</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>Dosyalar korunsun</translation> @@ -1507,7 +1507,7 @@ Silmeyi seçerseniz, sahibi değilseniz bu dosyaları artık kullanamazsınız.< <translation>Eski bir '%1' eşitleme günlüğü bulundu ancak kaldırılamadı. Günlüğün Başka bir uygulama tarafından kullanılmadığından emin olun.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Eski bir "%1" eşitleme günlüğü bulundu ancak kaldırılamadı. Günlüğün Başka bir uygulama tarafından kullanılmadığından emin olun.</translation> </message> @@ -2868,12 +2868,12 @@ güncelleyici başka izinler isteyebilir.</translation> <translation>Sanal dosyalar, yerel klasör olarak Windows bölümü kök klasörlerini desteklemez. Lütfen sürücü harfinin altında bulunan bir klasör seçin.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>%1 klasörü "%2", yerel "%3" klasörü ile eşitlendi</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>"%1" klasörünü eşitle</translation> </message> @@ -3371,14 +3371,24 @@ 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="490"/> + <source>permission</source> + <translation>izin</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>dosya kodu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> - <translation>sunucu numarası %1</translation> + <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="946"/> @@ -4185,7 +4195,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>'%1' için bir sonuç bulunamadı</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>"%1" için bir sonuç bulunamadı</translation> </message> @@ -4800,16 +4810,16 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Nokta ile biten dosya adları bu dosya sisteminde desteklenmiyor.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Yerel eşitleme klasörü açılamadı ya da oluşturulamadı. Eşitleme klasörüne yazma izniniz olduğundan emin olun.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <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/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Yerel eşitleme klasörü açılamadı ya da oluşturulamadı. Eşitleme klasörüne yazma izniniz olduğundan emin olun.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <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> @@ -4860,16 +4870,16 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Durum alınamadı.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="560"/> - <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="571"/> <source>Filename encoding is not valid</source> <translation>Dosya adı kodlaması geçersiz</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <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="643"/> <source>Cannot open the sync journal</source> <translation>Eşitleme günlüğü açılamadı</translation> @@ -4880,16 +4890,16 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Karakterler geçersiz, lütfen "%1" ögesini yeniden adlandırın</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1036"/> - <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="1110"/> <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/syncengine.cpp" line="1056"/> + <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="1045"/> <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> @@ -5829,7 +5839,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation>Dosya, ileti, etkinlik arayın …</translation> </message> @@ -5872,23 +5882,23 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Hesap bağlandı</translation> + <source>Current user status is online</source> + <translation>Geçerli kullanıcı durumu çevrimiçi</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>Hesap bağlanmadı</translation> + <source>Current user status is do not disturb</source> + <translation>Geçerli kullanıcı durumu rahatsız etmeyin</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>Geçerli kullanıcı durumu çevrimiçi</translation> + <source>Account connected</source> + <translation>Hesap bağlandı</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>Geçerli kullanıcı durumu rahatsız etmeyin</translation> + <source>Account not connected</source> + <translation>Hesap bağlanmadı</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5901,7 +5911,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Hesabı sil</translation> </message> <message> - <location filename="../src/gui/tray/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>Durumu ayarla</translation> </message> @@ -6092,7 +6102,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Tümünü eşitlemeyi duraklat</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>Kullanıcı durumunu ayarla</translation> </message> @@ -6192,7 +6202,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Paylaşma penceresini aç</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation>Birleşik arama sonuçları listesi</translation> </message> @@ -6203,7 +6213,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Diğer işlemleri görüntüle</translation> </message> <message> - <location filename="../src/gui/tray/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation>%1 - Dosya işlemi</translation> </message> diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 4a71755af..c959fb088 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -1341,13 +1341,6 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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="1052"/> <source>All files in the sync folder '%1' 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. @@ -1400,7 +1393,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Зберегти локальні файли як конфлікт</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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="1255"/> <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. @@ -1408,7 +1416,7 @@ 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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1425,14 +1433,6 @@ 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="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation type="unfinished"/> @@ -1479,7 +1479,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>Знайдено старий журнал синхронізації '%1', який неможливо вилучити. Будь ласка, впевніться що його не відкрито ув іншому застосунку.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"/> </message> @@ -2830,12 +2830,12 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation type="unfinished"/> </message> @@ -3327,13 +3327,23 @@ 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="490"/> + <source>permission</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <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="498"/> + <source>Server reported no %1</source> <translation type="unfinished"/> </message> <message> @@ -4141,7 +4151,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Відсутні результати для '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation type="unfinished"/> </message> @@ -4756,16 +4766,16 @@ 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="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>Неможливо відкрити або створити локальну синхронізовану базу даних. Перевірте, що ви маєте доступ на запис у синхронізованій теці.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Імена файлів, що містять символ '%1' не підтримуються файловою системою.</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Неможливо відкрити або створити локальну синхронізовану базу даних. Перевірте, що ви маєте доступ на запис у синхронізованій теці.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>Таке ім'я файлу є зарезервованим іменем файлової системи.</translation> @@ -4816,16 +4826,16 @@ 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="560"/> - <source>Unable to read from the sync journal.</source> - <translation>Неможливо прочитати з журналу синхронізації.</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="571"/> <source>Filename encoding is not valid</source> <translation>Кодування файлу не припустиме</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> + <translation>Неможливо прочитати з журналу синхронізації.</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="643"/> <source>Cannot open the sync journal</source> <translation>Не вдається відкрити протокол синхронізації</translation> @@ -4836,16 +4846,16 @@ 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="1036"/> - <source>Synchronization will resume shortly.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>Ім’я файлу містить принаймні один некоректний символ</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Закінчується місце на диску. Звантаження, які можуть зменшити вільне місце до 1% буде пропущено.</translation> @@ -5785,7 +5795,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation type="unfinished"/> </message> @@ -5828,22 +5838,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>Обліковий запис під’єднано</translation> + <source>Current user status is online</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> + <source>Current user status is do not disturb</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation type="unfinished"/> + <source>Account connected</source> + <translation>Обліковий запис під’єднано</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> + <source>Account not connected</source> <translation type="unfinished"/> </message> <message> @@ -5857,7 +5867,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation type="unfinished"/> </message> @@ -6048,7 +6058,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation type="unfinished"/> </message> @@ -6148,7 +6158,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation type="unfinished"/> </message> @@ -6159,7 +6169,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation type="unfinished"/> </message> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index 329793050..52e52146f 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -1348,13 +1348,6 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>本地同步文件夹“%1”中的所有文件已被删除。这些删除将与您的服务器同步，使这些文件不可用，除非恢复。您确定要与服务器同步这些操作吗?如果这是一个意外，您决定保留您的文件，它们将从服务器重新同步。</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1052"/> <source>All files in the sync folder '%1' 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. @@ -1414,7 +1407,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>保留本地文件为冲突文件</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>同步文件夹 '%1' 文件夹中的所有文件已在服务器上被删除。这些删除将同步到您的本地同步文件夹，使这些文件不可用，除非您有权恢复。如果您决定恢复这些文件，它们将与服务器重新同步，前提是您有这么做的权利。如果您决定删除这些文件，它们对您将不可用，除非您是所有者。</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>本地同步文件夹“%1”中的所有文件已被删除。这些删除将与您的服务器同步，使这些文件不可用，除非恢复。您确定要与服务器同步这些操作吗?如果这是一个意外，您决定保留您的文件，它们将从服务器重新同步。</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1255"/> <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. @@ -1425,7 +1433,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1444,14 +1452,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>移除所有文件</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>同步文件夹 '%1' 文件夹中的所有文件已在服务器上被删除。这些删除将同步到您的本地同步文件夹，使这些文件不可用，除非您有权恢复。如果您决定恢复这些文件，它们将与服务器重新同步，前提是您有这么做的权利。如果您决定删除这些文件，它们对您将不可用，除非您是所有者。</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>保留文件</translation> @@ -1498,7 +1498,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>找到旧的同步日志“%1”，但无法删除。请确保目前没有应用程序正在使用它。</translation> </message> @@ -2856,12 +2856,12 @@ for additional privileges during the process.</source> <translation>Windows 分区根目录不支持虚拟文件作为本地文件夹。请在驱动器号下选择有效的子文件夹。 </translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>%1 文件夹 "%2" 已同步至本地文件夹 "%3"</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>同步文件夹 "%1"</translation> </message> @@ -3353,13 +3353,23 @@ 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="490"/> + <source>permission</source> + <translation>权限</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>文件标识</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="498"/> + <source>Server reported no %1</source> <translation>服务器报告无 %1</translation> </message> <message> @@ -4167,7 +4177,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>没有 '%1' 相关结果</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>没有 "%1"相关结果</translation> </message> @@ -4782,16 +4792,16 @@ 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="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>无法打开或创建本地同步数据库。请确保您在同步文件夹下有写入权限。</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>此文件系统不支持包含字符 '%1' 的文件名。</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>无法打开或创建本地同步数据库。请确保您在同步文件夹下有写入权限。</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>文件名为系统保留文件名。</translation> @@ -4842,16 +4852,16 @@ 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="560"/> - <source>Unable to read from the sync journal.</source> - <translation>无法读取同步日志。</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="571"/> <source>Filename encoding is not valid</source> <translation>文件名编码无效</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> + <translation>无法读取同步日志。</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="643"/> <source>Cannot open the sync journal</source> <translation>无法打开同步日志</translation> @@ -4862,16 +4872,16 @@ 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="1036"/> - <source>Synchronization will resume shortly.</source> - <translation>同步将很快恢复。</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>文件名中存在至少一个非法字符</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation>同步将很快恢复。</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>硬盘剩余容量过低：下载后将会导致剩余容量低于 %1 的文件将会被跳过。</translation> @@ -5811,7 +5821,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation>搜索文件、消息、事件...</translation> </message> @@ -5854,23 +5864,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>账号已连接</translation> + <source>Current user status is online</source> + <translation>当前用户状态为“在线”</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>账号未连接</translation> + <source>Current user status is do not disturb</source> + <translation>当前用户状态为“请勿打扰”</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>当前用户状态为“在线”</translation> + <source>Account connected</source> + <translation>账号已连接</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>当前用户状态为“请勿打扰”</translation> + <source>Account not connected</source> + <translation>账号未连接</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5883,7 +5893,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>设置状态</translation> </message> @@ -6074,7 +6084,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>设定用户状态</translation> </message> @@ -6174,7 +6184,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation>统一的搜索结果列表</translation> </message> @@ -6185,7 +6195,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation>%1 - 文件动态</translation> </message> diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts index 2a67eb7ad..ab82753dd 100644 --- a/translations/client_zh_HK.ts +++ b/translations/client_zh_HK.ts @@ -1351,15 +1351,6 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>近端同步資料夾'%1'中的所有檔案都已刪除。這些刪除將與您的伺服器同步，除非恢復，否則此類檔案將不可用。 -您確定要與伺服器同步這些操作嗎？ -如果您意外刪除了檔案並決定保留它們，則它們將從伺服器重新同步。</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1052"/> <source>All files in the sync folder '%1' 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. @@ -1419,7 +1410,27 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>將近端檔案視為抵觸檔案</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>「%1」資料夾中的所有檔案已從伺服器上移除。 +同步後，這些檔案也會從您的近端資料夾中移除。除非您有復原的權限，否則您將無法讀取這些檔案。 +假如您決定復原這些檔案，只要您擁有權限，這些檔案就會重新和伺服器同步。 +假如您決定移除這些檔案，除非您是檔案的所有者，否則您將無法讀取這些檔案。</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>近端同步資料夾'%1'中的所有檔案都已刪除。這些刪除將與您的伺服器同步，除非恢復，否則此類檔案將不可用。 +您確定要與伺服器同步這些操作嗎？ +如果您意外刪除了檔案並決定保留它們，則它們將從伺服器重新同步。</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1255"/> <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. @@ -1430,7 +1441,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1449,17 +1460,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>移除所有檔案</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>「%1」資料夾中的所有檔案已從伺服器上移除。 -同步後，這些檔案也會從您的近端資料夾中移除。除非您有復原的權限，否則您將無法讀取這些檔案。 -假如您決定復原這些檔案，只要您擁有權限，這些檔案就會重新和伺服器同步。 -假如您決定移除這些檔案，除非您是檔案的所有者，否則您將無法讀取這些檔案。</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>保留檔案</translation> @@ -1506,7 +1506,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>發現較舊的同步處理日誌'%1'，但無法移除。請確認沒有應用程式正在使用它。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>發現較舊的同步處理日誌 "%1"，但無法移除。請確認沒有應用程式正在使用它。</translation> </message> @@ -2867,12 +2867,12 @@ for additional privileges during the process.</source> <translation>Windows分區根目錄不支持將虛擬文件作為近端資料夾使用。請在硬盤驅動器號下選擇一個有效的子資料夾。</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>%1 資料夾 "%2" 與近端資料夾 "%3" 同步</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>同步資料夾 "%1"</translation> </message> @@ -3370,13 +3370,23 @@ 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="490"/> + <source>permission</source> + <translation>權限</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>檔案 ID</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="498"/> + <source>Server reported no %1</source> <translation>伺服器報告沒有 %1</translation> </message> <message> @@ -4184,7 +4194,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>'%1' 沒有結果</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>"%1" 沒有結果</translation> </message> @@ -4799,16 +4809,16 @@ 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="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>無法開啟或新增近端同步數據庫。請確保您有寫入同步資料夾的權限。</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>此檔案系統不支援含「%1」字符的檔案名。</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>無法開啟或新增近端同步數據庫。請確保您有寫入同步資料夾的權限。</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>此檔案名已被此檔案系統保留所用。</translation> @@ -4859,16 +4869,16 @@ 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="560"/> - <source>Unable to read from the sync journal.</source> - <translation>無法讀取同步日誌。</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="571"/> <source>Filename encoding is not valid</source> <translation>檔案名稱編碼是無效的</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> + <translation>無法讀取同步日誌。</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="643"/> <source>Cannot open the sync journal</source> <translation>同步處理日誌無法開啟</translation> @@ -4879,16 +4889,16 @@ 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="1036"/> - <source>Synchronization will resume shortly.</source> - <translation>同步會很快恢復</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>檔案名稱含有不合法的字元</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation>同步會很快恢復</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>剩餘空間不足：下載後將使剩餘空間降至低於%1的檔案一律跳過。</translation> @@ -5828,7 +5838,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation>搜索檔案、訊息、活動 ...</translation> </message> @@ -5871,23 +5881,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>賬戶已連結</translation> + <source>Current user status is online</source> + <translation>目前用戶狀態為在線</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>未連接到賬戶</translation> + <source>Current user status is do not disturb</source> + <translation>目前用戶狀態為請勿打擾</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>目前用戶狀態為在線</translation> + <source>Account connected</source> + <translation>賬戶已連結</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>目前用戶狀態為請勿打擾</translation> + <source>Account not connected</source> + <translation>未連接到賬戶</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5900,7 +5910,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>設置狀態</translation> </message> @@ -6091,7 +6101,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>設置用戶狀態</translation> </message> @@ -6191,7 +6201,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation>統一搜索結果列表</translation> </message> @@ -6202,7 +6212,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation>%1 - 檔案活動紀錄</translation> </message> diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index ef94c7fa2..343055a2f 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -1352,15 +1352,6 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1260"/> - <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>在您本機同步資料夾「%1」中的所有檔案都已刪除。這些刪除將會與您的伺服器同步，除非復原，否則這些檔案將不可用。 -您確定您想要與伺服器同步那些動作嗎？ -如果這是意外，而且您決定保留您的檔案，它們將會自伺服器重新同步。</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1052"/> <source>All files in the sync folder '%1' 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. @@ -1420,7 +1411,27 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>將本機檔案視為衝突檔案</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1232"/> + <location filename="../src/gui/folder.cpp" line="1255"/> + <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. +If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> + <translation>「%1」資料夾中的所有檔案已從伺服器上移除。 +同步後，這些檔案也會從您的本地資料夾中移除。除非您有復原的權限，否則您將無法讀取這些檔案。 +假如您決定復原這些檔案，只要您擁有權限，這些檔案就會重新和伺服器同步。 +假如您決定移除這些檔案，除非您是檔案的所有者，否則您將無法讀取這些檔案。</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1260"/> + <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>在您本機同步資料夾「%1」中的所有檔案都已刪除。這些刪除將會與您的伺服器同步，除非復原，否則這些檔案將不可用。 +您確定您想要與伺服器同步那些動作嗎？ +如果這是意外，而且您決定保留您的檔案，它們將會自伺服器重新同步。</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1255"/> <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. @@ -1431,7 +1442,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="1237"/> + <location filename="../src/gui/folder.cpp" line="1260"/> <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> @@ -1450,17 +1461,6 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>移除所有檔案</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1255"/> - <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. -If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source> - <translation>「%1」資料夾中的所有檔案已從伺服器上移除。 -同步後，這些檔案也會從您的本地資料夾中移除。除非您有復原的權限，否則您將無法讀取這些檔案。 -假如您決定復原這些檔案，只要您擁有權限，這些檔案就會重新和伺服器同步。 -假如您決定移除這些檔案，除非您是檔案的所有者，否則您將無法讀取這些檔案。</translation> - </message> - <message> <location filename="../src/gui/folder.cpp" line="1269"/> <source>Keep files</source> <translation>保留檔案</translation> @@ -1507,7 +1507,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation>發現較舊的同步處理日誌「%1」，但無法移除。請確認沒有應用程式正在使用它。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="390"/> + <location filename="../src/gui/folderman.cpp" line="398"/> <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>發現較舊的同步處理日誌「%1」，但無法移除。請確認沒有應用程式正在使用它。</translation> </message> @@ -2868,12 +2868,12 @@ for additional privileges during the process.</source> <translation>Windows 分割區跟目錄不支援將虛擬檔案作為本機資料夾使用。請在磁碟區代號下選擇有效的子資料夾。</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="264"/> <source>%1 folder "%2" is synced to local folder "%3"</source> <translation>%1 資料夾「%2」與本機資料夾「%3」同步</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="262"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="267"/> <source>Sync the folder "%1"</source> <translation>同步資料夾「%1」</translation> </message> @@ -3371,13 +3371,23 @@ 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="490"/> + <source>permission</source> + <translation>權限</translation> + </message> + <message> <location filename="../src/libsync/discovery.cpp" line="452"/> <source>file id</source> <translation>檔案 ID</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="456"/> - <source>server reported no %1</source> + <location filename="../src/libsync/discovery.cpp" line="498"/> + <source>Server reported no %1</source> <translation>伺服器回報沒有 %1</translation> </message> <message> @@ -4185,7 +4195,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>「%1」沒有結果</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="339"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>No results for "%1"</source> <translation>「%1」沒有結果</translation> </message> @@ -4800,16 +4810,16 @@ 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="501"/> - <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation>無法開啟或建立本機同步資料庫。請確保您有寫入同步資料夾的權限。</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="507"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>此檔案系統不支援包含「%1」字元的檔案名稱。</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="501"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>無法開啟或建立本機同步資料庫。請確保您有寫入同步資料夾的權限。</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>The file name is a reserved name on this file system.</source> <translation>此檔案名稱為檔案系統的保留名稱。</translation> @@ -4860,16 +4870,16 @@ 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="560"/> - <source>Unable to read from the sync journal.</source> - <translation>無法讀取同步日誌。</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="571"/> <source>Filename encoding is not valid</source> <translation>檔案名稱編碼無效</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="560"/> + <source>Unable to read from the sync journal.</source> + <translation>無法讀取同步日誌。</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="643"/> <source>Cannot open the sync journal</source> <translation>無法開啟同步日誌</translation> @@ -4880,16 +4890,16 @@ 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="1036"/> - <source>Synchronization will resume shortly.</source> - <translation>同步會很快恢復</translation> - </message> - <message> <location filename="../src/libsync/syncengine.cpp" line="1110"/> <source>File name contains at least one invalid character</source> <translation>檔案名稱包含至少一個無效的字元</translation> </message> <message> + <location filename="../src/libsync/syncengine.cpp" line="1056"/> + <source>Synchronization will resume shortly.</source> + <translation>同步會很快恢復</translation> + </message> + <message> <location filename="../src/libsync/syncengine.cpp" line="1045"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>剩餘空間不足：下載後將使剩餘空間降至低於 %1 的檔案一律跳過。</translation> @@ -5829,7 +5839,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>UnifiedSearchInputContainer</name> <message> - <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="23"/> + <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/> <source>Search files, messages, events …</source> <translation>搜尋檔案、訊息、事件……</translation> </message> @@ -5872,23 +5882,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account connected</source> - <translation>帳號已連結</translation> + <source>Current user status is online</source> + <translation>目前的使用者狀態為在線上</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Account not connected</source> - <translation>未連線帳號</translation> + <source>Current user status is do not disturb</source> + <translation>目前的使用者狀態為請勿打擾</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is online</source> - <translation>目前的使用者狀態為在線上</translation> + <source>Account connected</source> + <translation>帳號已連結</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="94"/> - <source>Current user status is do not disturb</source> - <translation>目前的使用者狀態為請勿打擾</translation> + <source>Account not connected</source> + <translation>未連線帳號</translation> </message> <message> <location filename="../src/gui/tray/UserLine.qml" line="158"/> @@ -5901,7 +5911,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/UserLine.qml" line="200"/> + <location filename="../src/gui/tray/UserLine.qml" line="185"/> <source>Set status</source> <translation>設定狀態</translation> </message> @@ -6092,7 +6102,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/Window.qml" line="196"/> + <location filename="../src/gui/tray/Window.qml" line="190"/> <source>Set user status</source> <translation>設定使用者狀態</translation> </message> @@ -6192,7 +6202,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/Window.qml" line="678"/> + <location filename="../src/gui/tray/Window.qml" line="672"/> <source>Unified search results list</source> <translation>統一搜尋結果清單</translation> </message> @@ -6203,7 +6213,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/Window.qml" line="748"/> + <location filename="../src/gui/tray/Window.qml" line="743"/> <source>%1 - File activity</source> <translation>%1 - 檔案事件</translation> </message> |