# Translations
-Icon[de_DE]=@APPLICATION_ICON_NAME@
-Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung
-Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung
-GenericName[de_DE]=Ordnersynchronisierung
+Icon[de]=@APPLICATION_ICON_NAME@
+Name[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung
+Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung
+GenericName[de]=Synchronisierungsordner
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Open in blaaier</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Voeg rekening toe</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Meer toeps</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Open %1 in blaaier</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Отвори в браузъра</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Текущ профил</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Добавяне на регистрация</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Свързан</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Без връзка</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Още приложения</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Отвори %1 в браузъра</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>An diblasañ e-barzh ar boubelenn n'eo ket bet ouzhpennet c'hoaz war ar bladenn</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Ebarzhit ar frazenn-tremen E2E</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Roll kenaroud rannañ</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Digeriñ er furcher</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Kont bremañ</translation>
</message>
<translation>Ehanañ pep kemprennadenn</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Ouzhpenn ur c'hont</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Kuitaat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Kemprennet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Digemprennet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Muioc'h a veziantoù</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Digeriñ %1 er furcher</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation>Digeriñ an diviz rannañ</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>El desplaçament a la paperera no està implementat en aquesta plataforma</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Introduïu la contrasenya d'extrem a extrem</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Compartició del menú contextual</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Obre en el navegador</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation>Quadre de diàleg principal del client d'escriptori del Nextcloud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Compte actual</translation>
</message>
<translation>Atura la sincronització de tot</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation>Canvi de compte i menú de paràmetres</translation>
</message>
<translation>Afegeix un compte</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation>Afegeix un compte</translation>
</message>
<translation>Surt</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation>Avatar de l'usuari actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Connectat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation>Obre la carpeta local del compte actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Obre l'aplicació Converses del Nextcloud al navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Més aplicacions</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation>Menú d'aplicacions</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Obre %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation>Llista d'activitat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation>Obre el quadre de diàleg de compartició</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation>Obre l'aplicació Converses</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Přesun do koše není na této platformě implementováno</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Zadejte E2E heslovou frázi</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Sdílení kontextové nabídky</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Otevřít v prohlížeči</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation>Hlavní dialog Nextcloud desktop</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Stávající účet</translation>
</message>
<translation>Pozastavit synchronizaci u všeho</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation>Přepínání účtů a nabídka nastavení</translation>
</message>
<translation>Přidat účet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation>Přidat nový účet</translation>
</message>
<translation>Konec</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation>Zástupný obrázek stávajícího uživatele</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Připojeno</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Odpojeno</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation>Otevřít místní složku stávajícího účtu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Otevřít Nextcloud Talk v probhlížeči</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Více aplikací</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation>Nabídka aplikací</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Otevřít %1 v prohlížeči</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation>Seznam aktivit</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation>Otevřít %1 lokálně</translation>
</message>
<translation>Otevřít dialog sdílení</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation>Sdílet %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation>Otevřít Talk</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation>Otevřít Talk %1</translation>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Flytning af filer til skraldespand er ikke implementeret på denne platform</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Indtast E2E kodeord</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Deling af kontekst menu</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Åbn i browser</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Nuværende konto</translation>
</message>
<translation>Pause alle synkroniseringer</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Tilføj konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Afslut</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Forbundet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Frakoblet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Flere apps</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Åbn %1 i browser</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation>Åben deling dialog</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Verschieben in den Papierkorb ist auf dieser Plattform nicht möglich</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>E2E-Passphrase eingeben</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Kontextmenü Freigabe</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Im Browser öffnen</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation>Nextcloud Desktop-Hauptdialog</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Aktuelles Konto</translation>
</message>
<translation>Synchronisierung für alle pausieren</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation>Konto-Umschalter und Einstellungsmenü</translation>
</message>
<translation>Konto hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation>Neues Konto hinzufügen</translation>
</message>
<translation>Beenden</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation>Avatar des aktuellen Benutzers</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Verbunden</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Getrennt</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation>Lokalen Ordner des aktuellen Kontos öffnen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Nextcloud Talk im Browser öffnen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Weitere Apps</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation>Apps-Menü</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>%1 im Browser öffnen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation>Aktivitätenliste</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation>%1 lokal öffnen</translation>
</message>
<translation>Teilen-Dialog öffnen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation>%1 teilen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation>Talk öffnen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation>Öffne Talk %1</translation>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Η μετακίνηση στον κάδο δεν εφαρμόζεται σε αυτήν την πλατφόρμα</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Εισάγετε κωδικό E2E</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Διαμοιρασμός καταλόγου μενού</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Άνοιγμα στον περιηγητή</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<message>
<location filename="../src/gui/tray/UserLine.qml" line="92"/>
<source>Account not connected</source>
- <translation type="unfinished"/>
+ <translation>Ο λογαριασμός δεν συνδέθηκε</translation>
</message>
<message>
<location filename="../src/gui/tray/UserLine.qml" line="132"/>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Τρέχον λογαριασμός</translation>
</message>
<translation>Παύση όλων των συγχρονισμών</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Προσθήκη λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
- <translation type="unfinished"/>
+ <translation>Προσθήκη νέου λογαριασμού</translation>
</message>
<message>
<location filename="../src/gui/tray/Window.qml" line="249"/>
<translation>Έξοδος</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Συνδεδεμένο</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Αποσυνδεδεμένο</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
- <translation type="unfinished"/>
+ <translation>Άνοιγμα τοπικού φακέλου του τρέχων λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
- <translation type="unfinished"/>
+ <translation>Άνοιγμα του Nextcloud Talk με το πρόγραμμα περιήγησης.</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Περισσότερες εφαρμογές</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
- <translation type="unfinished"/>
+ <translation>Μενού εφαρμογών</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Άνοιγμα %1 στον περιηγητή</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation>Άνοιγμα του διαλόγου διαμοιρασμού</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
- <translation type="unfinished"/>
+ <translation>Άνοιγμα του Talk</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
- <translation type="unfinished"/>
+ <translation>Άνοιγμα του Talk %1</translation>
</message>
</context>
<context>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Moving to the trash is not implemented on this platform</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Enter E2E passphrase</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Context menu share</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Open in browser</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Current account</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Add account</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Exit</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Connected</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Disconnected</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>More apps</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Open %1 in browser</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Movi rubujen ankoraŭ ne estas realigita ĉe tiu sistemo</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Entajpu E2E (tutvoja) pasfrazon</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Menuo pri kunhavigo</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Malfermi per retumilo</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Nuna konto</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Aldoni konton</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Konektita</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Malkonektita</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Pli da aplikaĵoj</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Malfermi %1 per la retumilo</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Mover a la papelera no está implementado en esta plataforma</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Introduce la frase de acceso E2E</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Compartir en menú contextual</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Abrir en navegador</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation>Cuadro de diálogo principal de escritorio de Nextcloud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<translation>Pausar sincronización para todos</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation>Cambiador de cuentas y menú de configuración</translation>
</message>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation>Añadir cuenta nueva</translation>
</message>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation>Avatar del usuario actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation>Abrir carpeta local de la cuenta actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Abrir Nextcloud Talk en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Más aplicaciones</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation>Menú de apps</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation>Lista de actividad</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation>Abre %1 en local</translation>
</message>
<translation>Abrir diálogo de compartir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation>Comparte %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation>Abrir Talk</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation>Abrir Talk de %1</translation>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Más aplicaciones</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador...</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Más aplicaciones</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Más aplicaciones</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Más aplicaciones</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Más aplicaciones</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Más aplicaciones</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Más aplicaciones</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Más aplicaciones</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Más aplicaciones</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Cuenta actual</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Más aplicaciones</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Lisa konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Ühendatud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Lahti ühendatud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Veel rakendusi</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Ava %1 veebilehitsejas</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Plataforma honetan ezin da mugitu zakarrontzira</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Sartu muturretik muturrerako (E2E) pasahitza</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Testuinguruaren partekatze menua</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Ireki nabigatzailean</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Uneko kontua</translation>
</message>
<translation>Pausatu sinkronizazioa guztientzat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Gehitu kontua</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Irten</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Konektatuta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Deskonektatuta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Aplikazio gehiago</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Ireki %1 arakatzailean</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation>Ireki partekatzeko elkarrizketa-koadroa</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>انتقال فایل به سطل آشغال در این فلتفرم پیاده سازی نشده است</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>بازکردن در مرورگر</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>حساب جاری</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>افزودن حساب کاربری</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>خروج</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>متصل</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>قطع شده</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>برنامه های بیشتر</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>1% را در مرورگر باز کنید</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Avaa selaimessa</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Nykyinen tili</translation>
</message>
<translation>Tauota synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation>Tilin valinta ja asetukset</translation>
</message>
<translation>Lisää tili</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation>Lisää uusi tili</translation>
</message>
<translation>Poistu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation>Käyttäjän avatar</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Yhdistetty</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Yhteys katkaistu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Lisää sovelluksia</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Avaa %1 selaimeen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation>Aktiviteettilista</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation>Avaa jakoikkuna</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation>Avaa Talk</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Mettre à la corbeille n'est pas disponible sur cette plateforme</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Entrez la phrase secrète E2E</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Partage du menu contextuel</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Ouvrir dans le navigateur</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation>Boîte de dialogue principale du bureau Nextcloud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Compte actuel</translation>
</message>
<translation>Suspendre toutes les synchronisations</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation>Sélecteur de compte et menu des paramètres</translation>
</message>
<translation>Ajouter un compte</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation>Ajouter un nouveau compte</translation>
</message>
<translation>Quitter</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation>Avatar de l'utilisateur courant</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Connecté</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Déconnecté</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation>Ouvrir le dossier local de l'utilisateur courant</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Ouvrez Nextcloud Talk dans le navigateur</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Plus d'applications</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation>Menu apps</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Ouvrir %1 dans le navigateur</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation>Liste d'activités</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation>Ouvrir la fenêtre de partage</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation>Partager %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Mover ao lixo non está dispoñíbel nesta plataforma</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Introduza a frase de paso E2E</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Compartir o menú contextual</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation>Diálogo principal do escritorio Nextcloud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Conta actual</translation>
</message>
<translation>Por en pausa a sincronización para todos</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation>Cambiador de contas e menú de configuración</translation>
</message>
<translation>Engadir unha conta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation>Engadir unha conta nova</translation>
</message>
<translation>Saír</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation>Avatar do usuario actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation>Abrir o cartafol local da conta actual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Abrir o Nextcloud Talk no navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Máis aplicacións</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation>Menú de aplicacións</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 nun navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation>Lista de actividades</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation>Abrir %1 localmente</translation>
</message>
<translation>Abrir o diálogo de compartición</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation>Compartir %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation>Abrir Talk</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation>Abrir Talk %1</translation>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>העברה לסל המחזור לא אפשרית בפלטפורמה זו</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>נא להקליד ססמת הצפנה קצה לקצה</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>שיתוף מתפריט הקשר</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>פתיחה בדפדפן</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>חשבון נוכחי</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>הוספת חשבון</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>יציאה</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>מחובר</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>מנותק</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>יישומים נוספים</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>פתיחת %1 בדפדפן</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Premještanje u koš za smeće nije implementirano na ovoj platformi</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Unesite zaporku za E2E</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Dijeljenje kontekstnog izbornika</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Otvori u pregledniku</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Trenutni račun</translation>
</message>
<translation>Pauziraj sinkronizaciju za sve</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Dodaj račun</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Izlaz</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Povezan</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Odspojen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Više aplikacija</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Otvori %1 u pregledniku</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation>Otvori dijaloški okvir za dijeljenje</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>A kuka áthelyezése nincs megvalósítva ezen a platformon</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Adja meg az E2E jelmondatot</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Megosztás a helyi menüből</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Megnyitás böngészőben</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Jelenlegi fiók</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Fiók hozzáadása</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Kilépés</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Kapcsolódva</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Kapcsolat bontva</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>További alkalmazások</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>A(z) %1 megnyitása böngészőben</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Memindahkan tempat sampat tidak diimplementasikan pada platform ini</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Masukkan kata sandi (passphrase) E2E</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Akun sekarang</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Tambah akun</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Tersambung</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Terputus</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Aplikasi lainnya</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Settu inn EíE-lykilorð</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Deila í samhengisvalmynd</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Opna í vafra</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Núverandi notandaaðgangur</translation>
</message>
<translation>Gera hlé á samstillingu fyrir allt</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Bæta við notandaaðgangi</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Fara út</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Tengt</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Aftengt</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Fleiri forrit</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Opna %1 í vafra</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation>Opna deilingarglugga</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Lo spostamento nel cestino non è implementato su questa piattaforma</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Digita la frase segreta E2E</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Condivisione da menu contestuale</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Apri nel browser</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation>Finestra principale di Nextcloud desktop</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Account attuale</translation>
</message>
<translation>Sospendi la sincronizzazione per tutto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation>Selettore account e menu impostazioni</translation>
</message>
<translation>Aggiungi account</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation>Aggiungi nuovo account</translation>
</message>
<translation>Esci</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation>Avatar dell'utente attuale</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Connesso</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Disconnesso</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation>Apri cartella locale dell'account attuale</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Apri Nextcloud Talk nel browser</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Altre applicazioni</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation>Menu Applicazioni</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Apri %1 nel browser</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation>Elenco attività</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation>Apri %1 localmente</translation>
</message>
<translation>Apri finestra di condivisione</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation>Condividi %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation>Apri Talk</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation>Apri Talk %1</translation>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>ゴミ箱への移動はこのプラットフォームでは実装されていません</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>E2Eパスフレーズを入力</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>コンテキストメニューの共有</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>ブラウザーで開く</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>現在のアカウント</translation>
</message>
<translation>全ての同期を一時停止</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>アカウントを追加</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>終了</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>接続しました</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>切断しました</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>さらにアプリ</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>%1をブラウザーで開く</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation>共有ダイアログを開く</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>이 플랫폼에서 휴지통으로 이동을 지원하지 않음</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>E2E 암구호 입력</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>연락처 메뉴 공유</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>브라우저에서 열기</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>현재 계정</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>계정 추가</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>끝내기</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>연결됨</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>연결이 끊어졌습니다.</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>더 많은 앱</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>브라우저에서 %1 열기</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Perkėlimas į šiukšlinę šioje platformoje nėra įgyvendintas</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Įveskite E2E slaptą frazę</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Kontekstinio meniu pasidalinimas</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Atverti naršyklėje</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Dabartinė paskyra</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Pridėti paskyrą</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Išeiti</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Prijungta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Atjungta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Daugiau programėlių</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Atverti %1 naršyklėje</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation>Atverti bendrinimo dialogą</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Pārvietošana uz atkritni šajā platformā vēl nav ieviesta</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Ievadiet E2E paroli</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Pašreizējais konts</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Pievienot kontu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Savienojies</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Atvienojies</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Vairāk lietotnes</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Atvērt %1 pārlūkā</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Не е овозможено преместување во корпата со отпадоци</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Отвори во прелистувач</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Моментална сметка</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Додади сметка</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Излез</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Поврзан</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Исклучен</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Повеќе апликации</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Отвори %1 во прелистувач</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Flytting til papirkurven er ikke implementert på denne plattformen</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Åpne i nettleser</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Nåværende konto</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Legg til en konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Avslutt</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Tilkoblet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Frakoblet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Flere apper</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Åpne %1 i nettleser</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Verplaatsen naar de prullenbak wordt niet ondersteund op dit platform</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Invoeren E2E wachtwoordzin</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Contextmenu delen</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Openen in browser</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Huidige account</translation>
</message>
<translation>Synchronisatie voor iedereen onderbreken</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Account toevoegen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Afsluiten</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Verbonden</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Niet verbonden</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Meer apps</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Open %1 in browser</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation>Open het dialoogvenster voor delen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Lo desplaçament a l’escobilhièr es pas implementat sus aquesta plataforma</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Picatz la frasa secreta E2E</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Menú contèxtual del partatge</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Dobrir dins lo navegador</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Apondre un compte</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Quitar</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Connectat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation>Dobrir fenèstra de partatge</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Przeniesienie do kosza nie jest możliwe na tej platformie</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Wprowadź hasło dla end to end</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Menu kontekstowe udostępniania</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Otwórz w przeglądarce</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation>Główne okno pulpitu Nextcloud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Bieżące konto</translation>
</message>
<translation>Wstrzymaj synchronizację dla wszystkich</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation>Przełączenie konta i menu ustawień</translation>
</message>
<translation>Dodaj konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation>Dodaj nowe konto</translation>
</message>
<translation>Wyjście</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation>Aktualny awatar użytkownika</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Połączony</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Rozłączony</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation>Otwórz folder lokalny bieżącego konta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Otwórz Nextcloud Talk w przeglądarce</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Więcej aplikacji</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation>Menu aplikacji</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Otwórz %1 w przeglądarce</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation>Lista aktywności</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation>Otwórz %1 lokalnie</translation>
</message>
<translation>Otwórz okno udostępniania</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation>Udostępnij %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation>Otwórz Talk</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation>Otwórz Talk %1</translation>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Mover para o lixo não está implementado neste sistema</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Introduza palavra passe E2E</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Partilha do menu de contexto</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Conta atual</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Adicionar conta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Ligado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Desligado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Mais apps</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 no navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Mover para a lixeira não está implementada nesta plataforma</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Digite a senha E2E</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Compartilhamento do menu de contexto</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation>Diálogo principal do Nextcloud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Conta atual</translation>
</message>
<translation>Pausar a sincronização para todos</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation>Alternador de conta e menu de configurações</translation>
</message>
<translation>Adicionar conta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation>Adicionar nova conta</translation>
</message>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation>Avatar do usuário atual</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation>Abrir diretório local da conta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Abrir o Nextcloud Talk no navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Mais aplicativos</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation>Menu de aplicativos</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 no navegador</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation>Lista de atividade</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation>Abrir %1 localmente</translation>
</message>
<translation>Abrir janela de compartilhamento</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation>Compartilhar %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation>Abrir o Talk</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation>Abrir o Talk %1</translation>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Deschide în Browser</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Cont actual</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Adaugă cont</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Conectat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Deconenctat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Mai multe aplicatii</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Deschide %1 în Browser</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Перемещение в корзину не поддерживается на этой платформе</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Введите парольную фразу сквозного шифрования</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Контекстное меню предоставления общего доступа</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Открыть в браузере</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Текущая учётная запись</translation>
</message>
<translation>Приостановить синхронизацию всех учётных записей</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Добавить аккаунт</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Выход</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Подключено</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Отключено</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Ещё приложения</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Открыть %1 в браузере</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation>Открыть диалог настройки общего доступа</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Presúvanie do koša nie je v tejto platforme k dispozícii</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Zadajte E2E prístupovú frázu</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Sprístupnenie kontextovej ponuky</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Otvoriť v prehliadači</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Aktuálny účet</translation>
</message>
<translation>Pozastaviť synchronizáciu pre všetky účty</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Pridať účet</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Ukončiť</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Pripojené</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Odpojené</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Viac aplikácií</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Otvoriť %1 v prehliadači</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation>Otvoriť dialógové okno sprístupnenia</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>V tem okolju premikanje predmetov v smeti ni mogoče.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Vpis gesla za celovito šifriranje E2E</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Odpri v brskalniku</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation>Glavni vmesnik namizja Nextcloud</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Trenutni račun</translation>
</message>
<translation>Ustavi usklajevanje za vse</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation>Preklopnik računov in meni nastavitev</translation>
</message>
<translation>Dodaj račun</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation>Dodaj račun</translation>
</message>
<translation>Končaj</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation>Trenutna podoba uporabnika</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Povezano</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Brez povezave</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation>Odpri krajevno mapo v trenutnem računu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Odpri Nextcloud Talk v brskalniku</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Več programov</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation>Meni programov</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Odpri %1 v brskalniku</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation>Seznam dejavnosti</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation>Odpri datoteko %1 krajevno</translation>
</message>
<translation>Odpri pogovorno okno souporebe</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation>Odpri Talk</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation>Odpri Talk %1</translation>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Померање у канту није подржано на овој платформи</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Унесите E2E лозинку</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Контекстни мени дељења</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Отвори у веб читачу</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Тренутни налог</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Додај налог</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Изађи</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Повезан</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Неповезан</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Још апликација</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Отвори %1 у прегледачу</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Att flytta till papperskorgen är inte implementerat på denna plattform</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Ange lösenord för E2E</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Delningsmeny</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Öppna i webbläsare</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Nuvarande konto</translation>
</message>
<translation>Pausa synkronisering för alla</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Lägg till konto</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>Avsluta</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Ansluten</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Bortkopplad</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Fler appar</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Öppna %1 i webbläsaren</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation>Öppna delningsdialogen</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>เพิ่มบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>เชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>ยกเลิกการเชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>เปิด %1 ในเบราว์เซอร์</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Bu platform üzerinde çöpe taşıma özelliği yok</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Uçtan uca şifreleme parolasını yazın</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Sağ tık menüsü paylaşımı</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Tarayıcıda aç</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation>Nextcloud masaüstü ana penceresi</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Geçerli hesap</translation>
</message>
<translation>Tümünü eşitlemeyi duraklat</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation>Hesap değiştirici ve ayarlar menüsü</translation>
</message>
<translation>Hesap ekle</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation>Hesap ekle</translation>
</message>
<translation>Çık</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation>Geçerli kullanıcı avatarı</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>Bağlantı kuruldu</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Bağlantı kesildi</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation>Geçerli hesabın yerel klasörünü aç</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation>Web tarayıcıda Nextcloud Talk uygulamasını aç</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Diğer uygulamalar</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation>Uygulamalar menüsü</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>%1 ögesini tarayıcıda aç</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation>İşlem listesi</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation>%1 ögesini yerel olarak aç</translation>
</message>
<translation>Paylaşma penceresini aç</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation>%1 ögesini paylaş</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation>Talk Uygulamasını Aç</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation>Talk %1 Uygulamasını Aç</translation>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>Ця платформа не дозволяє переміщення об\'єктів до кошика</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>Зазначте пароль для наскрізного шифрування</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>Контекстне мені спільного доступу</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>Відкрити у бравзері</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>Поточний обліковий запис</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>Додати обліковий запис</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>З'єднаний</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>Від'єднаний</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>Більше застосунків</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>Відкрити %1 в браузері</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>当前平台尚未支持移动到回收站的功能</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>输入 E2E 密语</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>上下文目录共享</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>在浏览器中打开</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>当前账号</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>添加账号</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>退出</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>已连接</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>连接已断开</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>更多的应用程序</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>在浏览器中打开%1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
<source>Moving to the trash is not implemented on this platform</source>
<translation>此平台不具有移至回收桶功能</translation>
</message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="167"/>
+ <source>Error removing '%1': %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="183"/>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Flow2AuthWidget</name>
<translation>請輸入端到端密碼短語</translation>
</message>
</context>
+<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="94"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="148"/>
+ <source>Open local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="156"/>
+ <source>Open remote version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="174"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="175"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="88"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="134"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>OCC::ConnectionValidator</name>
<message>
<source>Context menu share</source>
<translation>分享內容選單</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="752"/>
+ <source>Select new location...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/socketapi.cpp" line="694"/>
<source>I shared something with you</source>
<source>Open in browser</source>
<translation>用瀏覽器打開</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="914"/>
+ <source>Resolve conflict...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="918"/>
+ <source>Move and rename...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="921"/>
+ <source>Move, rename and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
+ <source>Delete local changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="929"/>
+ <source>Move and upload...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="930"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
<name>Window</name>
<message>
<location filename="../src/gui/tray/Window.qml" line="25"/>
- <location filename="../src/gui/tray/Window.qml" line="99"/>
+ <location filename="../src/gui/tray/Window.qml" line="101"/>
<source>Nextcloud desktop main dialog</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="137"/>
+ <location filename="../src/gui/tray/Window.qml" line="139"/>
<source>Current account</source>
<translation>目前帳戶</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="175"/>
+ <location filename="../src/gui/tray/Window.qml" line="177"/>
<source>Account switcher and settings menu</source>
<translation type="unfinished"/>
</message>
<translation>新增帳戶</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="233"/>
+ <location filename="../src/gui/tray/Window.qml" line="235"/>
<source>Add new account</source>
<translation type="unfinished"/>
</message>
<translation>離開</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="334"/>
+ <location filename="../src/gui/tray/Window.qml" line="336"/>
<source>Current user avatar</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Connected</source>
<translation>已連線</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="366"/>
+ <location filename="../src/gui/tray/Window.qml" line="368"/>
<source>Disconnected</source>
<translation>已經離線</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="420"/>
+ <location filename="../src/gui/tray/Window.qml" line="422"/>
<source>Open local folder of current account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="432"/>
+ <location filename="../src/gui/tray/Window.qml" line="434"/>
<source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="450"/>
+ <location filename="../src/gui/tray/Window.qml" line="452"/>
<source>More apps</source>
<translation>更多應用程式</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="467"/>
+ <location filename="../src/gui/tray/Window.qml" line="469"/>
<source>Apps menu</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="495"/>
+ <location filename="../src/gui/tray/Window.qml" line="497"/>
<source>Open %1 in browser</source>
<translation>瀏覽器中開啟 %1</translation>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="519"/>
+ <location filename="../src/gui/tray/Window.qml" line="521"/>
<source>Activity list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="531"/>
+ <location filename="../src/gui/tray/Window.qml" line="533"/>
<source>Open %1 locally</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="647"/>
+ <location filename="../src/gui/tray/Window.qml" line="643"/>
<source>Share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="669"/>
+ <location filename="../src/gui/tray/Window.qml" line="665"/>
<source>Open Talk</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/Window.qml" line="673"/>
+ <location filename="../src/gui/tray/Window.qml" line="669"/>
<source>Open Talk %1</source>
<translation type="unfinished"/>
</message>
projects / nextcloud-desktop.git / commitdiff