Fix(l10n): 🔠 Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
This commit is contained in:
Nextcloud bot 2023-02-01 03:43:17 +00:00
parent 810fced476
commit fa90a876b4
No known key found for this signature in database
GPG key ID: 130DAB86D3FB356C
55 changed files with 2342 additions and 1755 deletions

View file

@ -442,7 +442,7 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="247"/>
<source>Disable encryption</source>
<translation type="unfinished"/>
<translation>Деактивиране на криптирането</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="252"/>
@ -634,17 +634,17 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>Disable end-to-end encryption</source>
<translation type="unfinished"/>
<translation>Деактивиране на цялостното криптиране</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1037"/>
<source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/>
<translation>Деактивиране на цялостното криптиране за %1?</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1038"/>
<source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source>
<translation type="unfinished"/>
<translation>Премахването на цялостното криптиране ще премахне локално синхронизираните файлове, които са шифровани. &lt;br&gt; Шифрованите файлове ще останат на сървъра.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1100"/>
@ -1049,37 +1049,37 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
<translation>Не може да се преименува файл, защото на сървъра, вече съществува файл със същото име. Моля, изберете друго име.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
<translation>Файлът не можа да се преименува. Моля, уверете се, че сте свързани със сървъра. </translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
<translation>Нямате право да преименувате този файл. Моля, помолете автора на файла да го преименува.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
<translation>Неуспешно извличане на права с грешка %1</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
<translation>Името на файла съдържа начални и крайни интервали.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
<translation>Името на файла съдържа начални интервали.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
<translation>Името на файла съдържа крайни интервали.</translation>
</message>
</context>
<context>
@ -1087,111 +1087,121 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
<translation>Конфликтен сблъсък на случаи</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
<translation>Файлът не може да бъде синхронизиран, тъй като поражда конфликтен сблъсък на случаи със съществуващ файл в тази система.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
<translation>Грешка</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation>Съществуващ файл</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
<translation>файл А</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
<translation>днес</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
<translation>0 байта</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
<translation>Отваряне на съществуващ файл</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation>Конфликтен файл в случая</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
<translation>файл Б</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
<translation>Отваряне на конфликтния файл</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
<translation>Моля, въведете ново име на конфликтния файл:</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
<translation>Ново име на файла</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
<translation>Преименуване на файл</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
<translation>Файлът &quot;%1&quot; не може да бъде синхронизиран, тъй като поражда конфликтен сблъсък на случаи със съществуващ файл в тази система.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
<translation>%1 не поддържа еднакви имена на файлове с разлики само в главните букви.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
<translation>Името на файла съдържа начални и крайни интервали.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
<translation>Името на файла съдържа начални интервали.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
<translation>Името на файла съдържа крайни интервали.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
<translation>Използване на невалидно име</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
<translation>Името на файла съдържа непозволени знаци: %1</translation>
</message>
</context>
<context>
@ -2017,7 +2027,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="166"/>
<source>Could not decrypt!</source>
<translation type="unfinished"/>
<translation>Не можа да се дешифрира!</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="168"/>
@ -2662,7 +2672,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/invalidfilenamedialog.ui" line="55"/>
<source>Please enter a new name for the file:</source>
<translation>Моля, въведете ново име за файла:</translation>
<translation>Моля, въведете новото име на файла:</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.ui" line="71"/>
@ -2727,7 +2737,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="211"/>
<source>Filename contains illegal characters: %1</source>
<translation>Името на файла съдържа невалидни знаци: %1</translation>
<translation>Името на файла съдържа непозволени знаци: %1</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="224"/>
@ -2761,12 +2771,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/legalnotice.cpp" line="55"/>
<source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;Авторски права 2017-2023 Nextcloud GmbH&lt;br /&gt; Авторски права 2012-2023 собственост наCloud GmbH&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.cpp" line="55"/>
<source>&lt;p&gt;Copyright 2017-2021 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2021 ownCloud GmbH&lt;/p&gt;</source>
<translation>&lt;p&gt;Авторски права 2017-2021 Nextcloud GmbH&lt;br /&gt; Авторски права 2012-2021 ownCloud GmbH&lt;/p&gt;</translation>
<translation>&lt;p&gt;Авторски права 2017-2021 Nextcloud GmbH&lt;br /&gt; Авторски права 2012-2021 собственост наCloud GmbH&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.cpp" line="58"/>
@ -3539,7 +3549,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="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
<translation>Конфликтен сблъсък на случаи: Сървърният файл е изтеглен и преименуван, за да се избегне сблъсък.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="381"/>
@ -3734,7 +3744,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="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
<translation>Файл %1 е изтеглен, но това е довело до сблъсък с имена на локалните файлове!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1325"/>
@ -3775,7 +3785,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>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
<translation>Папка %1 не може да бъде създадена поради сблъсък с имена на локални файлове или папки!</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="187"/>
@ -3816,7 +3826,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="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
<translation>Файл %1 е изтеглен, но това е довело до сблъсък с имена на локалните файлове!</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="270"/>
@ -4903,30 +4913,30 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
<translation>Разрешаване на конфликт</translation>
</message>
</context>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Потвърждение за Премахване на Профил</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Наистина ли желаете да премахнете връзката към профила&lt;i&gt; %1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Бележка:&lt;/b&gt; Дейтствието &lt;b&gt;няма&lt;/b&gt; да предизвика изтриване на файлове.</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Премахване на връзката</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Отказ</translation>
</message>
@ -5460,7 +5470,7 @@ Server replied with error: %2</source>
<translation>Вие променихте %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>Синхронизиран %1</translation>
</message>
@ -6090,12 +6100,12 @@ Server replied with error: %2</source>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="43"/>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation>Изтеглена е версия на сървъра, копирана е, променен локален файл в конфликтен файл</translation>
<translation>Изтеглена е версия на сървъра, копиран е промененият локален файл в конфликтен файл</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
<translation>Изтеглена е версия на сървъра, копиран е промененият локален файл в конфликтен файл</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="47"/>

View file

@ -1099,6 +1099,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1127,6 +1132,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4877,7 +4887,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4885,22 +4895,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Gwiriañ Lamaden ar C&apos;hont</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Sur oc&apos;h o peus c&apos;hoant lemel ar genstagadenn d&apos;ar c&apos;hont %1&lt;i&gt; ?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Notenn :&lt;/b&gt; Ne lamo &lt;b&gt;ket&lt;/b&gt; restr ebet.</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Lemel kenstagdenn</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Arrest</translation>
</message>
@ -5434,7 +5444,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1103,6 +1103,11 @@ Aquesta acció anul·larà qualsevol sincronització en execució.</translation>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1131,6 +1136,11 @@ Aquesta acció anul·larà qualsevol sincronització en execució.</translation>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4877,7 +4887,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4885,22 +4895,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirmeu la supressió del compte</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Segur que voleu suprimir la connexió al compte &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; això &lt;b&gt;no&lt;/b&gt; suprimirà cap fitxer.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Suprimeix la connexió</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Cancel·la</translation>
</message>
@ -5434,7 +5444,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1049,22 +1049,22 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
<translation>Soubor není možné přejmenovat, protože soubor se stejným názvem na serveru existuje. Vyberte jiný název.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
<translation>Přejmenovat soubor se nepodařilo. Ujistěte se, že jste připojení k serveru.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
<translation>Nemáte potřebná práva k přejmenování souboru. Požádejte vlastníka souboru, aby ho přejmenoval.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
<translation>Nepodařilo se získat oprávnění kvůli chybě %1</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
@ -1087,12 +1087,12 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
<translation>Kolize stejných názvů lišících se jen velikostí písmen</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
<translation>Soubor nemohl být synchronizován protože vytváří kolizi stejných názvů lišících se jen velikostí písmen s existujícím souborem na tomto stroji.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
@ -1106,9 +1106,14 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation>SouborA</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
@ -1130,23 +1135,28 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation>Soubor vyvolávající kolizi stejných názvů lišících se jen velikostí písmen</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
<translation>souborB</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
<translation>Otevřít soubor vyvolávající kolizi stejných názvů lišících se jen velikostí písmen</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
<translation>Zadejte nový název pro soubor vyvolávající kolizi stejných názvů lišících se jen velikostí písmen:</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
@ -1161,12 +1171,12 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
<translation>Soubor %1 nebylo možné synchronizovat kvůli kolizi stejných názvů lišících se jen velikostí písmen s existujícím souborem na tomto stroji.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
<translation>%1 nepodporuje stejné názvy souborů lišící se pouze velikostí písmen.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
@ -3538,7 +3548,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
<translation>Kolize stejných názvů lišících se jen velikostí písmen: soubor ze serveru stažen a přejmenován, aby se zabránilo kolizi.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="381"/>
@ -3733,7 +3743,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
<translation>Soubor %1 stažen, ale mělo za následek kolizi stejných názvů lišících se jen velikostí písmen se souborem na stroji!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1325"/>
@ -3774,7 +3784,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
<translation>Složku %1 není možné vytvořit kvůli kolizi stejných názvů lišících se jen velikostí písmen se souborem či složkou na stroji!</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="187"/>
@ -3815,7 +3825,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
<translation>Soubor %1 stažen, ale mělo za následek kolizi stejných názvů lišících se jen velikostí písmen se souborem na stroji!</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="270"/>
@ -4902,7 +4912,7 @@ Server odpověděl chybou: %2</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation>Vyřešit konflikt</translation>
</message>
@ -4910,22 +4920,22 @@ Server odpověděl chybou: %2</translation>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Potvrďte odebrání účtu</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Opravdu chcete odebrat propojení s účtem &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Pozn.:&lt;/b&gt; Toto &lt;b&gt;nesmaže&lt;/b&gt; žádné soubory.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Odebrat spojení</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Storno</translation>
</message>
@ -5459,7 +5469,7 @@ Server odpověděl chybou: %2</translation>
<translation>Změnili jste %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>Synchronizováno %1</translation>
</message>
@ -6094,7 +6104,7 @@ Server odpověděl chybou: %2</translation>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
<translation>Stažena verze ze serveru, změněný místní soubor zkopírován do konfliktního souboru kolize stejných názvů lišících se jen velikostí písmen</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="47"/>

View file

@ -1103,6 +1103,11 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1131,6 +1136,11 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4882,7 +4892,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4890,22 +4900,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Bekræft sletning af konto</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ønsker du virkelig at fjerne forbindelse til kontoen &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt;Dette sletter &lt;b&gt;ikke&lt;/b&gt;nogen filer.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Fjern forbindelse</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Annullér</translation>
</message>
@ -5439,7 +5449,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

File diff suppressed because it is too large Load diff

View file

@ -1099,6 +1099,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1127,6 +1132,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4885,7 +4895,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4893,22 +4903,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Επιβεβαίωση Αφαίρεσης Λογαριασμού</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Θέλετε πραγματικά να αφαιρέσετε τη σύνδεση με το λογαριασμό &lt;i&gt;%1&lt;/i&gt;;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Σημείωση:&lt;/b&gt; Αυτό &lt;b&gt;δεν&lt;/b&gt; θα διαγράψει κανένα αρχείο.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Αφαίρεση σύνδεσης</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Ακύρωση</translation>
</message>
@ -5442,7 +5452,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1049,37 +1049,37 @@ This action will abort any currently running synchronization.</translation>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
<translation>Cannot rename file because a file with the same name already exists on the server. Please pick another name.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
<translation>Could not rename file. Please make sure you are connected to the server.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
<translation>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
<translation>Failed to fetch permissions with error %1</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
<translation>Filename contains leading and trailing spaces.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
<translation>Filename contains leading spaces.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
<translation>Filename contains trailing spaces.</translation>
</message>
</context>
<context>
@ -1087,111 +1087,121 @@ This action will abort any currently running synchronization.</translation>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
<translation>Case Clash Conflict</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
<translation>The file could not be synced because it generates a case clash conflict with an existing file on this system.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
<translation>Error</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation>Existing file</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
<translation>fileA</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
<translation>today</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
<translation>0 byte</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
<translation>Open existing file</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation>Case clashing file</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
<translation>fileB</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
<translation>Open clashing file</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
<translation>Please enter a new name for the clashing file:</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
<translation>New filename</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
<translation>Rename file</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
<translation>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
<translation>%1 does not support equal file names with only letter casing differences.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
<translation>Filename contains leading and trailing spaces.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
<translation>Filename contains leading spaces.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
<translation>Filename contains trailing spaces.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
<translation>Use invalid name</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
<translation>Filename contains illegal characters: %1</translation>
</message>
</context>
<context>
@ -3539,7 +3549,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="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
<translation>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="381"/>
@ -3734,7 +3744,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="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
<translation>File %1 downloaded but it resulted in a local file name clash!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1325"/>
@ -3775,7 +3785,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>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
<translation>Folder %1 cannot be created because of a local file or folder name clash!</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="187"/>
@ -3816,7 +3826,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="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
<translation>File %1 downloaded but it resulted in a local file name clash!</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="270"/>
@ -4903,30 +4913,30 @@ Server replied with error: %2</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
<translation>Resolve conflict</translation>
</message>
</context>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirm Account Removal</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Remove connection</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Cancel</translation>
</message>
@ -5460,7 +5470,7 @@ Server replied with error: %2</translation>
<translation>You changed %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>Synced %1</translation>
</message>
@ -6095,7 +6105,7 @@ Server replied with error: %2</translation>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
<translation>Server version downloaded, copied changed local file into case conflict conflict file</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="47"/>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4875,7 +4885,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4883,22 +4893,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Forigi konekton</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Nuligi</translation>
</message>
@ -5432,7 +5442,7 @@ Server replied with error: %2</source>
<translation>Vi ŝanĝis %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>Sinkronigis %1</translation>
</message>

View file

@ -1104,6 +1104,11 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1132,6 +1137,11 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4904,7 +4914,7 @@ El servidor respondió con el error: %2</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4912,22 +4922,22 @@ El servidor respondió con el error: %2</translation>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirma la eliminación de cuenta</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿De verdad quieres eliminar la conexión con la cuenta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Aviso:&lt;/b&gt; Esto &lt;b&gt;no eliminará&lt;/b&gt; ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Eliminar vinculación</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@ -5461,7 +5471,7 @@ El servidor respondió con el error: %2</translation>
<translation>Has cambiado %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>Sincronizado %1</translation>
</message>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4868,7 +4878,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4876,22 +4886,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@ -5425,7 +5435,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4868,7 +4878,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4876,22 +4886,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@ -5425,7 +5435,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4868,7 +4878,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4876,22 +4886,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@ -5425,7 +5435,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4868,7 +4878,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4876,22 +4886,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@ -5425,7 +5435,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4868,7 +4878,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4876,22 +4886,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@ -5425,7 +5435,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4868,7 +4878,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4876,22 +4886,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@ -5425,7 +5435,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4868,7 +4878,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4876,22 +4886,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@ -5425,7 +5435,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4868,7 +4878,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4876,22 +4886,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@ -5425,7 +5435,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4868,7 +4878,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4876,22 +4886,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@ -5425,7 +5435,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4866,7 +4876,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4874,22 +4884,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@ -5423,7 +5433,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1049,37 +1049,37 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
<translation>Ezin da fitxategia berrizendatu izen berdina duen fitxategi bat existitzen delako zerbitzarian dagoeneko. Mesedez, aukeratu beste izen bat.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
<translation>Ezin izan da fitxategia berrizendatu. Mesedez egiaztatu zerbitzarira konektatuta zaudela.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
<translation>Ez duzu baimenik fitxategi hau berrizendatzeko. Mesedez, eskatu fitxategiaren jabeari berrizendatzeko.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
<translation>Ezin izan dira baimenak eskuratu %1 errorearekin</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
<translation>Fitxategi-izenak hasierako eta amaierako zuriuneak dauzka.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
<translation>Fitxategi-izenak hasierako zuriunea dauka.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
<translation>Fitxategi-izenak amaierako zuriunea dauka.</translation>
</message>
</context>
<context>
@ -1097,13 +1097,18 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
<translation>Errorea</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1113,13 +1118,13 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
<translation>gaur</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
<translation>0 byte</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
@ -1132,6 +1137,11 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -1151,12 +1161,12 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
<translation>Fitxategi-izen berria</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
<translation>Berrizendatu fitxategia</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
@ -1171,27 +1181,27 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
<translation>Fitxategi-izenak hasierako eta amaierako zuriuneak dauzka.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
<translation>Fitxategi-izenak hasierako zuriunea dauka.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
<translation>Fitxategi-izenak amaierako zuriunea dauka.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
<translation>Erabili izen baliogabea</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
<translation>Fitxategiak karaktere ilegalak dauzka: %1</translation>
</message>
</context>
<context>
@ -4903,30 +4913,30 @@ Zerbitzariak errorearekin erantzun du: %2</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
<translation>Ebatzi gatazka</translation>
</message>
</context>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Baieztatu kontua kentzea</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ziur zaude &lt;i&gt;%1&lt;/i&gt; kontura konexioa kendu nahi duzula?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Oharra:&lt;/b&gt; Honek &lt;b&gt;ez&lt;/b&gt; du fitxategirik ezabatuko.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Kendu konexioa</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Utzi</translation>
</message>
@ -5460,7 +5470,7 @@ Zerbitzariak errorearekin erantzun du: %2</translation>
<translation>%1 aldatu duzu</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>%1 sinkronizatuta</translation>
</message>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4867,7 +4877,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4875,22 +4885,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@ -5424,7 +5434,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1095,11 +1095,16 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
<translation>Virhe</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation>Olemassa oleva tiedosto</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
@ -1111,25 +1116,30 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
<translation>tänään</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
<translation>0 tavua</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
<translation>Avaa olemassa oleva tiedosto</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -1149,12 +1159,12 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
<translation>Uusi tiedostonimi</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
<translation>Nimeä tiedosto uudelleen</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
@ -1504,7 +1514,7 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
<message>
<location filename="../src/gui/editlocallyjob.cpp" line="641"/>
<source>File %1 now locked.</source>
<translation type="unfinished"/>
<translation>Tiedosto %1 on lukittu.</translation>
</message>
<message>
<location filename="../src/gui/editlocallyjob.cpp" line="650"/>
@ -1528,43 +1538,43 @@ OpenSSL-kirjastosi kanssa saattaa olla ongelma.</translation>
<location filename="../src/gui/filedetails/filedetails.cpp" line="100"/>
<source>%1 second(s) ago</source>
<comment>seconds elapsed since file last modified</comment>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>%1 sekunti sitten</numerusform><numerusform>%1 sekuntia sitten</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/filedetails/filedetails.cpp" line="103"/>
<source>%1 minute(s) ago</source>
<comment>minutes elapsed since file last modified</comment>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>%1 minuutti sitten</numerusform><numerusform>%1 minuuttia sitten</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/filedetails/filedetails.cpp" line="106"/>
<source>%1 hour(s) ago</source>
<comment>hours elapsed since file last modified</comment>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>%1 tunti sitten</numerusform><numerusform>%1 tuntia sitten</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/filedetails/filedetails.cpp" line="109"/>
<source>%1 day(s) ago</source>
<comment>days elapsed since file last modified</comment>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>%1 päivä sitten</numerusform><numerusform>%1 päivää sitten</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/filedetails/filedetails.cpp" line="112"/>
<source>%1 month(s) ago</source>
<comment>months elapsed since file last modified</comment>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>%1 kuukausi sitten</numerusform><numerusform>%1 kuukautta sitten</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/filedetails/filedetails.cpp" line="115"/>
<source>%1 year(s) ago</source>
<comment>years elapsed since file last modified</comment>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>%1 vuosi sitten</numerusform><numerusform>%1 vuotta sitten</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/filedetails/filedetails.cpp" line="147"/>
<source>Locked by %1 - Expires in %2 minute(s)</source>
<comment>remaining time before lock expires</comment>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>Lukinnut %1 - Vanhenee %2 minuutin kuluttua</numerusform><numerusform>Lukinnut %1 - Vanhenee %2 minuutin kuluttua</numerusform></translation>
</message>
</context>
<context>
@ -2006,7 +2016,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="166"/>
<source>Could not decrypt!</source>
<translation type="unfinished"/>
<translation>Salausta ei voitu purkaa!</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="168"/>
@ -3923,7 +3933,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="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
<translation>Salatun tiedoston lähettäminen epäonnistui.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="266"/>
@ -4162,7 +4172,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/filedetails/sharemodel.cpp" line="797"/>
<source>Enter a note for the recipient</source>
<translation type="unfinished"/>
<translation>Lisää muistiinpano vastaanottajalle</translation>
</message>
</context>
<context>
@ -4257,7 +4267,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="549"/>
<source>Failed to encrypt folder</source>
<translation type="unfinished"/>
<translation>Kansion salaaminen epäonnistui</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="550"/>
@ -4269,12 +4279,12 @@ Server replied with error: %2</source>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="555"/>
<source>Folder encrypted successfully</source>
<translation type="unfinished"/>
<translation>Kansio salattu onnistuneesti</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="556"/>
<source>The following folder was encrypted successfully: &quot;%1&quot;</source>
<translation type="unfinished"/>
<translation>Seuraava kansio salattiin: &quot;%1&quot;</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="758"/>
@ -4317,7 +4327,7 @@ Server replied with error: %2</source>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
<source>Expire in %1 minutes</source>
<comment>remaining time before lock expire</comment>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>Vanhenna %1 minuutin kuluttua</numerusform><numerusform>Vanhenna %1 minuutin kuluttua</numerusform></translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1131"/>
@ -4369,7 +4379,7 @@ Server replied with error: %2</source>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Expires in %1 minutes</source>
<comment>remaining time before lock expires</comment>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>Vanhenee %1 minuutin kuluttua</numerusform><numerusform>Vanhenee %1 minuutin kuluttua</numerusform></translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1327"/>
@ -4759,7 +4769,7 @@ Server replied with error: %2</source>
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="227"/>
<source>Syncing file %1 of %2</source>
<translation type="unfinished"/>
<translation>Synkronoidaan tiedostoa %1/%2</translation>
</message>
</context>
<context>
@ -4879,30 +4889,30 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
<translation>Selvitä ristiriita</translation>
</message>
</context>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Vahvista tilin poistaminen</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Poista yhteys</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Peruuta</translation>
</message>
@ -5436,7 +5446,7 @@ Server replied with error: %2</source>
<translation>Muutit %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>Synkronoitu %1</translation>
</message>
@ -5507,17 +5517,17 @@ Server replied with error: %2</source>
<message>
<location filename="../src/gui/filedetails/ShareDelegate.qml" line="159"/>
<source>Create a new share link</source>
<translation type="unfinished"/>
<translation>Luo uusi jakolinkki</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDelegate.qml" line="179"/>
<source>Copy share link location</source>
<translation type="unfinished"/>
<translation>Kopioi jakolinkki</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDelegate.qml" line="208"/>
<source>Share options</source>
<translation type="unfinished"/>
<translation>Jakamisen valinnat</translation>
</message>
</context>
<context>
@ -5530,12 +5540,12 @@ Server replied with error: %2</source>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="220"/>
<source>Edit share</source>
<translation type="unfinished"/>
<translation>Muokkaa jakoa</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="237"/>
<source>Dismiss</source>
<translation type="unfinished"/>
<translation>Hylkää</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="296"/>
@ -5545,37 +5555,37 @@ Server replied with error: %2</source>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="329"/>
<source>Allow editing</source>
<translation type="unfinished"/>
<translation>Salli muokkaaminen</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="357"/>
<source>Password protect</source>
<translation type="unfinished"/>
<translation>Suojaa salasanalla</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="462"/>
<source>Set expiration date</source>
<translation type="unfinished"/>
<translation>Aseta vanhenemispäivä</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="653"/>
<source>Note to recipient</source>
<translation type="unfinished"/>
<translation>Viesti vastaanottajalle</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="721"/>
<source>Unshare</source>
<translation type="unfinished"/>
<translation>Lopeta jakaminen</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="738"/>
<source>Add another link</source>
<translation type="unfinished"/>
<translation>Lisää toinen linkki</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="769"/>
<source>Copy share link</source>
<translation type="unfinished"/>
<translation>Kopioi jakolinkki</translation>
</message>
</context>
<context>
@ -5583,27 +5593,27 @@ Server replied with error: %2</source>
<message>
<location filename="../src/gui/filedetails/ShareView.qml" line="91"/>
<source>Password required for new share</source>
<translation type="unfinished"/>
<translation>Uusi jako vaatii salasanan</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareView.qml" line="133"/>
<source>Share password</source>
<translation type="unfinished"/>
<translation>Jaon salasana</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareView.qml" line="291"/>
<source>Sharing is disabled</source>
<translation type="unfinished"/>
<translation>Jakaminen on poistettu käytöstä</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareView.qml" line="299"/>
<source>This item cannot be shared.</source>
<translation type="unfinished"/>
<translation>Tätä kohdetta ei voi jakaa.</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareView.qml" line="308"/>
<source>Sharing is disabled.</source>
<translation type="unfinished"/>
<translation>Jakaminen on poistettu käytöstä.</translation>
</message>
</context>
<context>
@ -5611,7 +5621,7 @@ Server replied with error: %2</source>
<message>
<location filename="../src/gui/filedetails/ShareeSearchField.qml" line="47"/>
<source>Search for users or groups</source>
<translation type="unfinished"/>
<translation>Etsi käyttäjiä tai ryhmiä</translation>
</message>
</context>
<context>
@ -5680,7 +5690,7 @@ Server replied with error: %2</source>
<message>
<location filename="../src/gui/tray/UnifiedSearchResultNothingFound.qml" line="26"/>
<source>No results for</source>
<translation type="unfinished"/>
<translation>Ei tuloksia haulla</translation>
</message>
</context>
<context>
@ -5706,12 +5716,12 @@ Server replied with error: %2</source>
<message>
<location filename="../src/gui/tray/UserLine.qml" line="64"/>
<source>Current account status is online</source>
<translation type="unfinished"/>
<translation>Nykyinen tilin tila on &quot;Online&quot;</translation>
</message>
<message>
<location filename="../src/gui/tray/UserLine.qml" line="64"/>
<source>Current account status is do not disturb</source>
<translation type="unfinished"/>
<translation>Nykyinen tilin tila on &quot;Ä häiritse&quot;</translation>
</message>
<message>
<location filename="../src/gui/tray/UserLine.qml" line="89"/>
@ -5967,12 +5977,12 @@ Server replied with error: %2</source>
<message>
<location filename="../src/gui/tray/Window.qml" line="502"/>
<source>Current account status is online</source>
<translation type="unfinished"/>
<translation>Nykyinen tilin tila on &quot;Online&quot;</translation>
</message>
<message>
<location filename="../src/gui/tray/Window.qml" line="502"/>
<source>Current account status is do not disturb</source>
<translation type="unfinished"/>
<translation>Nykyinen tilin tila on &quot;Ä häiritse&quot;</translation>
</message>
<message>
<location filename="../src/gui/tray/Window.qml" line="851"/>
@ -6324,12 +6334,12 @@ Server replied with error: %2</source>
<message>
<location filename="../src/gui/sharedialog.cpp" line="332"/>
<source>The file cannot be shared because it does not have sharing permission.</source>
<translation type="unfinished"/>
<translation>Tiedostoa ei voi jakaa, koska siinä ei ole jakamisoikeutta.</translation>
</message>
<message>
<location filename="../src/gui/sharedialog.cpp" line="417"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
<translation>Syötä salasana linkkijaolle:</translation>
</message>
<message>
<location filename="../src/gui/sharedialog.cpp" line="418"/>
@ -6367,7 +6377,7 @@ Server replied with error: %2</source>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="190"/>
<source>View only</source>
<translation type="unfinished"/>
<translation>Vain katselu</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="196"/>

View file

@ -641,7 +641,7 @@ Cette action entraînera l&apos;interruption de toute synchronisation en cours.<
<message>
<location filename="../src/gui/accountsettings.cpp" line="1038"/>
<source>Removing end-to-end encryption will remove locally-synced files that are encrypted.&lt;br&gt;Encrypted files will remain on the server.</source>
<translation type="unfinished"/>
<translation>Le retrait du chiffrage de bout en bout supprimera localement les fichiers chiffrés synchronisés.&lt;br&gt;Les fichiers chiffrés demeureront sur le serveur.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1100"/>
@ -1047,37 +1047,37 @@ Vous prenez vos propres risques.</translation>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
<translation>Impossible de renommer le fichier parce qu&apos;un fichier portant le même nom existe déjà sur le serveur. Veuillez choisir un autre nom.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
<translation>Impossible de renommer le fichier. Assurez-vous de bien être connecté au serveur.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
<translation>Vous n&apos;avez pas les permissions de renommer ce fichier. Veuillez demander à son auteur de le renommer.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
<translation>Échec de récupération de permissions avec l&apos;erreur %1</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
<translation>Le nom de fichier contient des espaces de début et de fin.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
<translation>Le nom de fichier contient des espaces de début.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
<translation>Le nom de fichier contient des espaces de fin.</translation>
</message>
</context>
<context>
@ -1085,111 +1085,121 @@ Vous prenez vos propres risques.</translation>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
<translation>Conflit de casse</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
<translation>Le fichier n&apos;a pas pu être synchronisé parce qu&apos;il génère un conflit de casse avec un fichier existant dans ce système.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
<translation>Erreur</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation>Fichier existant</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
<translation>fichierA</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
<translation>aujourd&apos;hui</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
<translation>0 octets</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
<translation>Ouvrir un fichier existant</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation>Fichier avec conflit de casse</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
<translation>fichierB</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
<translation>Ouvrir le fichier conflictuel</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
<translation>Veuillez saisir un nouveau nom pour le fichier conflictuel :</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
<translation>Nouveau nom de fichier</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
<translation>Renomer le fichier</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
<translation>Le fichier &quot;%1&quot; n&apos;a pas pu être synchronisé à cause d&apos;un conflit de casse avec un fichier existant dans ce système.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
<translation>%1 ne supporte pas les noms de fichiers identiques avec seulement des différences de casse de caractère.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
<translation>Le nom de fichier contient des espaces de début et de fin.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
<translation>Le nom de fichier contient des espaces de début.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
<translation>Le nom de fichier contient des espaces de fin.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
<translation>Nom invalide</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
<translation>Le nom du fichier contient des caractères illégaux : %1</translation>
</message>
</context>
<context>
@ -2016,7 +2026,7 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="166"/>
<source>Could not decrypt!</source>
<translation type="unfinished"/>
<translation>Déchiffrage impossible !</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="168"/>
@ -2760,7 +2770,7 @@ Les éléments ayant l&apos;option &quot;Autoriser la suppression&quot; pourront
<message>
<location filename="../src/gui/legalnotice.cpp" line="55"/>
<source>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;p&gt;Copyright 2017-2023 Nextcloud GmbH&lt;br /&gt;Copyright 2012-2023 ownCloud GmbH&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/legalnotice.cpp" line="55"/>
@ -3538,7 +3548,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
<translation>Conflit de casse : fichier serveur téléchargé et renommé pour éviter le conflit.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="381"/>
@ -3733,7 +3743,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
<translation>Fichier %1 téléchargé, mais a abouti à un conflit de casse du nom de fichier local !</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1325"/>
@ -3774,7 +3784,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
<translation>Le dossier %1 n&apos;a pu être créé à cause d&apos;un conflit local de nom de fichier ou de dossier !</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="187"/>
@ -3815,7 +3825,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
<translation>Fichier %1 téléchargé, mais a abouti à un conflit de casse du nom de fichier local !</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="270"/>
@ -4902,30 +4912,30 @@ Le serveur a répondu avec l&apos;erreur : %2</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
<translation>Conflit résolu</translation>
</message>
</context>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirmer la suppression du compte</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Êtes-vous certain de vouloir retirer la connexion au compte &lt;i&gt;%1&lt;/i&gt; ?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note :&lt;/b&gt; cette opération &lt;b&gt;ne supprimera aucun de vos fichiers&lt;/b&gt; et ne supprimera pas non plus votre compte du serveur.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Supprimer la connexion</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
@ -5459,7 +5469,7 @@ Le serveur a répondu avec l&apos;erreur : %2</translation>
<translation>Vous avez modifié %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>%1 a é synchronisé</translation>
</message>
@ -6094,7 +6104,7 @@ Le serveur a répondu avec l&apos;erreur : %2</translation>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
<translation>La version du serveur est téléchargée, les changements locaux ont é copiés dans un fichier de conflit de casse.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="47"/>

View file

@ -1103,6 +1103,11 @@ Esta acción interromperá calquera sincronización que estea a executarse actua
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1131,6 +1136,11 @@ Esta acción interromperá calquera sincronización que estea a executarse actua
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4895,7 +4905,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4903,22 +4913,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirme a retirada da conta</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Confirma que quere retirar a conexión a conta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Aviso:&lt;/b&gt; Isto &lt;b&gt;non&lt;/b&gt; eliminará ningún ficheiro.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Retirar conexión</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@ -5452,7 +5462,7 @@ Server replied with error: %2</source>
<translation>Vostede cambiou %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>Sincronizou %1</translation>
</message>

View file

@ -1099,6 +1099,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1127,6 +1132,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4873,7 +4883,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4881,22 +4891,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>אישור הסרת חשבון</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;להסיר את החיבור לחשבון &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;לתשומת לבך:&lt;/b&gt; פעולה זו &lt;b&gt;לא&lt;/b&gt; תמחק אף קובץ.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>הסרת חיבור</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>ביטול</translation>
</message>
@ -5430,7 +5440,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1103,6 +1103,11 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju.</translation>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1131,6 +1136,11 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju.</translation>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4900,7 +4910,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4908,22 +4918,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Potvrdi brisanje računa</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Želite li zaista ukloniti vezu s računom &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Napomena:&lt;/b&gt; time &lt;b&gt;nećete&lt;/b&gt; izbrisati datoteke.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Ukloni vezu</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Odustani</translation>
</message>
@ -5457,7 +5467,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1104,6 +1104,11 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást.</translation>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1132,6 +1137,11 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást.</translation>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4904,7 +4914,7 @@ A kiszolgáló hibával válaszolt: %2</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4912,22 +4922,22 @@ A kiszolgáló hibával válaszolt: %2</translation>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Fiók törlésének megerősítése</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Biztos, hogy eltávolítja a kapcsolatot a(z) &lt;i&gt;%1&lt;/i&gt; fiókkal?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Megjegyzés:&lt;/b&gt; Ez &lt;b&gt;nem&lt;/b&gt; töröl fájlokat.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Kapcsolat eltávolítása</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Mégse</translation>
</message>
@ -5461,7 +5471,7 @@ A kiszolgáló hibával válaszolt: %2</translation>
<translation>Megváltoztatta: %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>Szinkronizálta: %1</translation>
</message>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4872,7 +4882,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4880,22 +4890,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@ -5429,7 +5439,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1103,6 +1103,11 @@ gagnageymslur: </translation>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1131,6 +1136,11 @@ gagnageymslur: </translation>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4877,7 +4887,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4885,23 +4895,23 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Staðfesta fjarlægingu aðgangs</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Viltu í alvörunni fjarlægja tenginguna við aðganginn
&lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Athugið:&lt;/b&gt; Þetta mun &lt;b&gt;ekki&lt;/b&gt; eyða neinum skrám.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Fjarlægja tengingu</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Hætta við</translation>
</message>
@ -5435,7 +5445,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1103,6 +1103,11 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1131,6 +1136,11 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4891,7 +4901,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4899,22 +4909,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Conferma rimozione account</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vuoi davvero rimuovere la connessione all&apos;account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; ciò &lt;b&gt;non&lt;/b&gt; eliminerà alcun file.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Rimuovi connessione</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
@ -5448,7 +5458,7 @@ Server replied with error: %2</source>
<translation>Hai modificato %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>%1 sincronizzato</translation>
</message>

View file

@ -1103,6 +1103,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1131,6 +1136,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4899,7 +4909,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4907,22 +4917,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt; &lt;i&gt;%1&lt;/i&gt; &lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; &lt;b&gt;&lt;/b&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation></translation>
</message>
@ -5456,7 +5466,7 @@ Server replied with error: %2</source>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>%1 </translation>
</message>

View file

@ -1103,6 +1103,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1131,6 +1136,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4903,7 +4913,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4911,22 +4921,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation> </translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt; &lt;i&gt;%1&lt;/i&gt;() ?&lt;/p&gt;&lt;p&gt;&lt;b&gt;:&lt;/b&gt; &lt;b&gt;&lt;/b&gt; .&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation> </translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation></translation>
</message>
@ -5460,7 +5470,7 @@ Server replied with error: %2</source>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>%1 </translation>
</message>

View file

@ -1099,6 +1099,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1127,6 +1132,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4878,7 +4888,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4886,22 +4896,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Patvirtinti paskyros šalinimą</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ar tikrai norite pašalinti ryšį su paskyra &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Pastaba:&lt;/b&gt; Tai &lt;b&gt;neištrins&lt;/b&gt; jokių failų.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Šalinti ryšį</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Atsisakyti</translation>
</message>
@ -5435,7 +5445,7 @@ Server replied with error: %2</source>
<translation>Jūs pakeitėte %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4866,7 +4876,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4874,22 +4884,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Atcelt</translation>
</message>
@ -5423,7 +5433,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4875,7 +4885,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4883,22 +4893,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Потврди отстранување на сметка</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Дали сте сигурни дека сакате да ја отстраните врската со сметката &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Забелешка:&lt;/b&gt; Ова &lt;b&gt;нема&lt;/b&gt; да избрише ниту една датотека.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Отстрани врска</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Откажи</translation>
</message>
@ -5432,7 +5442,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1103,6 +1103,11 @@ Denne handlingen vil avbryte enhver synkronisering som kjører.</translation>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1131,6 +1136,11 @@ Denne handlingen vil avbryte enhver synkronisering som kjører.</translation>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4876,7 +4886,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4884,22 +4894,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Bekreft fjerning av konto</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Fjern tilkobling</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
@ -5433,7 +5443,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>Synkronisert %1</translation>
</message>

View file

@ -1102,6 +1102,11 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.</translati
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1130,6 +1135,11 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.</translati
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4903,7 +4913,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4911,22 +4921,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Bevestig verwijderen account</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Wilt je echt de verbinding met het account &lt;i&gt;%1&lt;/i&gt; verbreken?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Let op:&lt;/b&gt; Hierdoor verwijder je &lt;b&gt;geen&lt;/b&gt; bestanden.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Verwijderen verbinding</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Annuleren</translation>
</message>
@ -5460,7 +5470,7 @@ Server replied with error: %2</source>
<translation>Je wijzigde %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>Gesynchroniseerd %1</translation>
</message>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4866,7 +4876,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4874,22 +4884,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirmatz la supression del compte</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Suprimir la connexion</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Anullar</translation>
</message>
@ -5423,7 +5433,7 @@ Server replied with error: %2</source>
<translation>Avètz modificat %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1104,6 +1104,11 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans
<source>Existing file</source>
<translation>Istniejący plik</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1132,6 +1137,11 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans
<source>Case clashing file</source>
<translation>Plik kolidujący</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4903,7 +4913,7 @@ Serwer odpowiedział błędem: %2</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation>Rozwiąż konflikt</translation>
</message>
@ -4911,22 +4921,22 @@ Serwer odpowiedział błędem: %2</translation>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Potwierdź usunięcie konta</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Czy na pewno chcesz usunąć połączenie z kontem &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Uwaga:&lt;/b&gt; Ta operacja &lt;b&gt;nie&lt;/b&gt; usunie plików klienta.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Usuń połączenie</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Anuluj</translation>
</message>
@ -5460,7 +5470,7 @@ Serwer odpowiedział błędem: %2</translation>
<translation>Zmieniłeś %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>Zsynchronizowano %1</translation>
</message>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4870,7 +4880,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4878,22 +4888,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@ -5427,7 +5437,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1104,6 +1104,11 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.</tr
<source>Existing file</source>
<translation>Arquivo existente</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1132,6 +1137,11 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.</tr
<source>Case clashing file</source>
<translation>Arquivo de conflito de caso</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4901,7 +4911,7 @@ Servidor respondeu com erro: %2</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation>Resolver conflito</translation>
</message>
@ -4909,22 +4919,22 @@ Servidor respondeu com erro: %2</translation>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirme a Exclusão da Conta</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Quer realmente excluir a conexão para a conta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Obs.:&lt;/b&gt; Isso &lt;b&gt;não&lt;/b&gt; excluirá nenhum arquivo.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Excluir conexão</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@ -5458,7 +5468,7 @@ Servidor respondeu com erro: %2</translation>
<translation>Você modificou %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>%1 sincronizado</translation>
</message>

View file

@ -1103,6 +1103,11 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.</
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1131,6 +1136,11 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.</
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4880,7 +4890,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4888,22 +4898,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@ -5437,7 +5447,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1102,6 +1102,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1130,6 +1135,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4897,7 +4907,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4905,22 +4915,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Подтверждение удаления учётной записи</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Действительно удалить подключение к учётной записи &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Примечание:&lt;/b&gt; Это действие &lt;b&gt;не&lt;/b&gt; приведёт к удалению файлов.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Удалить подключение</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
@ -5454,7 +5464,7 @@ Server replied with error: %2</source>
<translation>Вы изменили «%1»</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>Файл «%1» синхронизирован</translation>
</message>

View file

@ -1103,6 +1103,11 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.</
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1131,6 +1136,11 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.</
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4900,7 +4910,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4908,22 +4918,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Cunfirma bogada de su contu</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;A beru nche cheres bogare sa connessione a su contu &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Mira:&lt;/b&gt; custu &lt;b&gt;no at a&lt;/b&gt; cantzellare perunu archìviu.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Boga connessione</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
@ -5457,7 +5467,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1103,6 +1103,11 @@ Táto akcia zruší všetky prebiehajúce synchronizácie.</translation>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1131,6 +1136,11 @@ Táto akcia zruší všetky prebiehajúce synchronizácie.</translation>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4900,7 +4910,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4908,22 +4918,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Potvrďte ostránenie účtu</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Naozaj chcete odstrániť pripojenie k účtu &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Poznámka:&lt;/b&gt; Týmto sa &lt;b&gt;neodstránia&lt;/b&gt; žiadne súbory.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Vymazať prepojenie</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Zrušiť</translation>
</message>
@ -5457,7 +5467,7 @@ Server replied with error: %2</source>
<translation>Zmenili ste %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>Zosynchronizované %1</translation>
</message>

View file

@ -1103,6 +1103,11 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.</trans
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1131,6 +1136,11 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.</trans
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4900,7 +4910,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4908,22 +4918,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Potrdi odstranjevanje računa</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ali res želite odstraniti povezavo z računom &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Opomba:&lt;/b&gt; odstranitev povezave &lt;b&gt;ne izbriše&lt;/b&gt; nobene datoteke.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Odstrani povezavo</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Prekliči</translation>
</message>
@ -5457,7 +5467,7 @@ Server replied with error: %2</source>
<translation>Spremenili ste %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>Usklajeno %1</translation>
</message>

View file

@ -1099,6 +1099,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1127,6 +1132,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4878,7 +4888,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4886,22 +4896,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Потврдите уклањања налога</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Да ли стварно желите да уклоните конекцију ка налогу &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Белешка:&lt;/b&gt; Овим &lt;b&gt;нећете&lt;/b&gt;обрисати ниједан фајл.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Уклоните конекцију</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Поништи</translation>
</message>
@ -5435,7 +5445,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1049,37 +1049,37 @@ Den här åtgärden avbryter alla synkroniseringar som körs.</translation>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
<translation>Kunde inte byta namn filen eftersom filnamnet är upptaget. Ange ett annat filnamn.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
<translation>Kunde inte byta namn filen. Kontrollera anslutningen till servern.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
<translation>Du har inte behörighet att byta namn den här filen. Be ägaren till filen att byta namn den.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
<translation>Misslyckades att hämta behörigheter med felet %1</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
<translation>Filnamnet innehåller blanksteg i början och slutet.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
<translation>Filnamnet innehåller inledande blanksteg.</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
<translation>Filnamnet innehåller blanksteg i slutet.</translation>
</message>
</context>
<context>
@ -1087,111 +1087,121 @@ Den här åtgärden avbryter alla synkroniseringar som körs.</translation>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
<translation>Skiftlägeskonflikt</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
<translation>Filen kunde inte synkroniseras eftersom den skapar en skiftlägeskonflikt med en befintlig fil detta system.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
<translation>Fel</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation>Befintlig fil</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
<translation type="unfinished"/>
<translation>filA</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
<translation>idag</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
<translation>0 byte</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
<translation>Öppna befintlig fil</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation>Fil med skiftlägeskonflikt.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
<translation type="unfinished"/>
<translation>filB</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
<translation>Öppna den konfliktande filen</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
<translation>Ange ett nytt namn för den konfliktande filen:</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
<translation>Nytt filnamn</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
<translation>Byt namn fil</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
<translation>Filen &quot;%1&quot; kunde inte synkroniseras grund av en skiftlägeskonflikt med en befintlig fil detta system.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
<translation>%1 stöder inte lika filnamn med endast skiftlägesskillnader.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
<translation>Filnamnet innehåller blanksteg i början och slutet.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
<translation>Filnamnet innehåller inledande blanksteg.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
<translation>Filnamnet innehåller blanksteg i slutet.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
<translation>Använd ogiltigt namn</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
<translation>Filnamnet innehåller ogiltiga tecken: %1</translation>
</message>
</context>
<context>
@ -3539,7 +3549,7 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda
<message>
<location filename="../src/libsync/discovery.cpp" line="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
<translation>Skiftlägeskonflikt: Serverfilen har laddats ner och döpts om för att undvika konflikt.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="381"/>
@ -3734,7 +3744,7 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
<translation>Fil %1 har laddats ner men det resulterade i en konflikt med ett lokalt filnamn!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1325"/>
@ -3775,7 +3785,7 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
<translation>Mapp %1 kan inte skapas grund av en konflikt med ett lokalt fil- eller mappnamn!</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="187"/>
@ -3816,7 +3826,7 @@ Detta är ett nytt experimentellt läge. Om du bestämmer dig för att använda
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
<translation>Fil %1 har laddats ner men det resulterade i en konflikt med ett lokalt filnamn!</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="270"/>
@ -4903,30 +4913,30 @@ Servern svarade med fel: %2</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
<translation>Lös konflikt</translation>
</message>
</context>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Bekräfta radering an kontot</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vill du verkligen ta bort anslutningen till konto &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;OBS:&lt;/b&gt; Detta kommer &lt;b&gt;inte&lt;/b&gt; radera några filer.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Ta bort anslutning</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
@ -5460,7 +5470,7 @@ Servern svarade med fel: %2</translation>
<translation>Du ändrade %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>Synkroniserade %1</translation>
</message>
@ -6095,7 +6105,7 @@ Servern svarade med fel: %2</translation>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
<translation>Serverversionen har laddats ner, den ändrade lokala filen har kopierats in i en fil för skiftlägeskonflikt.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="47"/>

View file

@ -1098,6 +1098,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1126,6 +1131,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4871,7 +4881,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4879,22 +4889,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@ -5428,7 +5438,7 @@ Server replied with error: %2</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation type="unfinished"/>
</message>

View file

@ -1104,6 +1104,11 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</transl
<source>Existing file</source>
<translation>Var olan dosya</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1132,6 +1137,11 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</transl
<source>Case clashing file</source>
<translation>Çakışan dosya</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4902,7 +4912,7 @@ Sunucunun verdiği hata yanıtı: %2</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation>Çakışmayı çöz</translation>
</message>
@ -4910,22 +4920,22 @@ Sunucunun verdiği hata yanıtı: %2</translation>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Hesap silmeyi onaylayın</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;i&gt;%1&lt;/i&gt; hesabının bağlantısını silmek istediğinize emin misiniz?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Not:&lt;/b&gt; Bu işlem herhangi bir dosyayı &lt;b&gt;silmez&lt;/b&gt;.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Bağlantıyı sil</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>İptal</translation>
</message>
@ -5459,7 +5469,7 @@ Sunucunun verdiği hata yanıtı: %2</translation>
<translation>%1 ögesini değiştirdiniz</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>%1 ögesi eşitlendi</translation>
</message>

View file

@ -1103,6 +1103,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1131,6 +1136,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4900,7 +4910,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4908,22 +4918,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Підтвердіть вилучення облікового запису</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Дійсно вилучити з&apos;єднання з обліковим записом &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Примітка:&lt;/b&gt; Це &lt;b&gt;не &lt;/b&gt; призведе до вилучення файлів.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation>Вилучити з&apos;єднання</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation>Скасувати</translation>
</message>
@ -5457,7 +5467,7 @@ Server replied with error: %2</source>
<translation>Ви змінили %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation>Синхронізовано %1</translation>
</message>

View file

@ -1100,6 +1100,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1128,6 +1133,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4888,7 +4898,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
</message>
@ -4896,22 +4906,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;i&gt;%1&lt;/i&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;&lt;/b&gt; &lt;b&gt;&lt;/b&gt; &lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation></translation>
</message>
@ -5445,7 +5455,7 @@ Server replied with error: %2</source>
<translation> %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation> %1</translation>
</message>

View file

@ -1050,37 +1050,37 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
<translation> %1</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -1088,21 +1088,26 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
<source>Case Clash Conflict</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
<source>Existing file</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
@ -1114,23 +1119,28 @@ This action will abort any currently running synchronization.</source>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
<source>today</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
<source>0 byte</source>
<translation type="unfinished"/>
<translation>0 </translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="105"/>
<source>Open existing file</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
<source>Case clashing file</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
@ -1142,57 +1152,57 @@ This action will abort any currently running synchronization.</source>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="113"/>
<source>Open clashing file</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
<source>Please enter a new name for the clashing file:</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
<source>New filename</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="97"/>
<source>Rename file</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="99"/>
<source>The file &quot;%1&quot; could not be synced because of a case clash conflict with an existing file on this system.</source>
<translation type="unfinished"/>
<translation>%1</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="100"/>
<source>%1 does not support equal file names with only letter casing differences.</source>
<translation type="unfinished"/>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="243"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="246"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="248"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="253"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
<translation>使</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="278"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
<translation>%1</translation>
</message>
</context>
<context>
@ -3538,7 +3548,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="377"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="381"/>
@ -3733,7 +3743,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="1215"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
<translation> %1</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1325"/>
@ -3774,7 +3784,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>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
<translation> %1</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="187"/>
@ -3815,7 +3825,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="254"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
<translation> %1</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="270"/>
@ -4902,30 +4912,30 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;i&gt;%1&lt;/i&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;&lt;/b&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation></translation>
</message>
@ -5459,7 +5469,7 @@ Server replied with error: %2</source>
<translation> %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation> %1</translation>
</message>
@ -6094,7 +6104,7 @@ Server replied with error: %2</source>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="47"/>

View file

@ -1104,6 +1104,11 @@ This action will abort any currently running synchronization.</source>
<source>Existing file</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>file A</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
<source>fileA</source>
@ -1132,6 +1137,11 @@ This action will abort any currently running synchronization.</source>
<source>Case clashing file</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>file B</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
<source>fileB</source>
@ -4903,7 +4913,7 @@ Server replied with error: %2</source>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="600"/>
<location filename="../src/gui/tray/usermodel.cpp" line="723"/>
<location filename="../src/gui/tray/usermodel.cpp" line="724"/>
<source>Resolve conflict</source>
<translation></translation>
</message>
@ -4911,22 +4921,22 @@ Server replied with error: %2</source>
<context>
<name>OCC::UserModel</name>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1145"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1146"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt; &lt;i&gt;%1&lt;/i&gt; &lt;/p&gt;&lt;p&gt;&lt;b&gt;&lt;/b&gt;&lt;b&gt;&lt;/b&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1150"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<source>Remove connection</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1151"/>
<location filename="../src/gui/tray/usermodel.cpp" line="1152"/>
<source>Cancel</source>
<translation></translation>
</message>
@ -5460,7 +5470,7 @@ Server replied with error: %2</source>
<translation> %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="678"/>
<location filename="../src/gui/tray/usermodel.cpp" line="679"/>
<source>Synced %1</source>
<translation> %1</translation>
</message>