diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-07-22 18:02:51 +0300 |
|---|---|---|
| committer | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-07-22 18:02:51 +0300 |
| commit | 2576b2819c25209944c70510b65dc753bb9a5a1c (patch) | |
| tree | cdf60561c668f559c3f25f9b7ab779652bafb3ff /translations/client_en.ts | |
| parent | ccaffae6ca2567ae5bae9fae4be23a49e88e30e2 (diff) | |
[tx] updated client translations from transifex
Diffstat (limited to 'translations/client_en.ts')
| -rw-r--r-- | translations/client_en.ts | 1099 |
1 files changed, 535 insertions, 564 deletions
diff --git a/translations/client_en.ts b/translations/client_en.ts index 845da8a24..119cc591f 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -4,18 +4,18 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="388"/> <source>Could not make directories in trash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="402"/> + <location filename="../src/common/filesystembase.cpp" line="408"/> <source>Could not move '%1' to '%2'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="450"/> + <location filename="../src/common/filesystembase.cpp" line="445"/> <source>Moving to the trash is not implemented on this platform</source> <translation type="unfinished"></translation> </message> @@ -38,12 +38,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> + <location filename="../src/gui/folderwizardsourcepage.ui" line="20"/> <source>Pick a local folder on your computer to sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="44"/> + <location filename="../src/gui/folderwizardsourcepage.ui" line="29"/> <source>&Choose...</source> <translation type="unfinished"></translation> </message> @@ -56,55 +56,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="20"/> <source>Select a remote destination folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="49"/> <source>Create Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="56"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="39"/> <source>Folders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> + <location filename="../src/gui/folderwizardtargetpage.ui" line="169"/> <source>TextLabel</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>GETFileJob</name> - <message> - <location filename="../src/libsync/propagatedownload.cpp" line="180"/> - <source>No E-Tag received from server, check Proxy/Gateway</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/propagatedownload.cpp" line="187"/> - <source>We received a different E-Tag for resuming. Retrying next time.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/propagatedownload.cpp" line="197"/> - <source>We received an unexpected download Content-Length.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/propagatedownload.cpp" line="224"/> - <source>Server returned wrong content-range</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>NotificationWidget</name> <message> <location filename="../src/gui/notificationwidget.ui" line="20"/> @@ -130,17 +107,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> <source>Connection timed out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> <source>Unknown error: network reply was deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="449"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation type="unfinished"></translation> </message> @@ -154,44 +131,49 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="58"/> + <source>Re-open Browser </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/accountsettings.ui" line="65"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="86"/> <source>Storage space: ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <location filename="../src/gui/accountsettings.ui" line="159"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="205"/> <source>Synchronize all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="212"/> <source>Synchronize none</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="219"/> <source>Apply manual changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="267"/> <source>Apply</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="507"/> - <location filename="../src/gui/accountsettings.cpp" line="614"/> - <location filename="../src/gui/accountsettings.cpp" line="1053"/> + <location filename="../src/gui/accountsettings.ui" line="254"/> + <location filename="../src/gui/accountsettings.cpp" line="512"/> + <location filename="../src/gui/accountsettings.cpp" line="624"/> + <location filename="../src/gui/accountsettings.cpp" line="1083"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -201,87 +183,87 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="182"/> <source>No account configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="193"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> <source>Add new</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="201"/> + <location filename="../src/gui/accountsettings.cpp" line="209"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="205"/> + <location filename="../src/gui/accountsettings.cpp" line="213"/> <source>Account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="307"/> + <location filename="../src/gui/accountsettings.cpp" line="310"/> <source>Choose what to sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="313"/> + <location filename="../src/gui/accountsettings.cpp" line="316"/> <source>Force sync now</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="315"/> + <location filename="../src/gui/accountsettings.cpp" line="318"/> <source>Restart sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="324"/> + <location filename="../src/gui/accountsettings.cpp" line="327"/> <source>Remove folder sync connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="353"/> + <location filename="../src/gui/accountsettings.cpp" line="356"/> <source>Enable virtual file support %1...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="353"/> + <location filename="../src/gui/accountsettings.cpp" line="356"/> <source>(tech preview)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="353"/> + <location filename="../src/gui/accountsettings.cpp" line="356"/> <source>(experimental)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="442"/> + <location filename="../src/gui/accountsettings.cpp" line="445"/> <source>Folder creation failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="443"/> + <location filename="../src/gui/accountsettings.cpp" line="446"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="499"/> + <location filename="../src/gui/accountsettings.cpp" line="504"/> <source>Confirm Folder Sync Connection Removal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="506"/> + <location filename="../src/gui/accountsettings.cpp" line="511"/> <source>Remove Folder Sync Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="615"/> <source>Disable virtual file support?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="606"/> + <location filename="../src/gui/accountsettings.cpp" line="616"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -290,168 +272,173 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="613"/> + <location filename="../src/gui/accountsettings.cpp" line="623"/> <source>Disable support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="718"/> + <location filename="../src/gui/accountsettings.cpp" line="733"/> <source>Sync Running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="719"/> + <location filename="../src/gui/accountsettings.cpp" line="734"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="829"/> <source>%1 in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="841"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>%1 as <i>%2</i></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="849"/> + <location filename="../src/gui/accountsettings.cpp" line="865"/> <source>Connected to %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="851"/> + <location filename="../src/gui/accountsettings.cpp" line="870"/> <source>Server %1 is temporarily unavailable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="853"/> + <location filename="../src/gui/accountsettings.cpp" line="873"/> <source>Server %1 is currently in maintenance mode.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="876"/> <source>Signed out from %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="864"/> - <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="886"/> <source>Connecting to %1...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="871"/> + <location filename="../src/gui/accountsettings.cpp" line="891"/> <source>No connection to %1 at %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="900"/> + <location filename="../src/gui/accountsettings.cpp" line="930"/> <source>Log in</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="996"/> + <location filename="../src/gui/accountsettings.cpp" line="1026"/> <source>There are folders that were not synchronized because they are too big: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="998"/> + <location filename="../src/gui/accountsettings.cpp" line="1028"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="999"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1045"/> + <location filename="../src/gui/accountsettings.cpp" line="1075"/> <source>Confirm Account Removal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1046"/> + <location filename="../src/gui/accountsettings.cpp" line="1076"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1052"/> + <location filename="../src/gui/accountsettings.cpp" line="1082"/> <source>Remove connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Open folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="197"/> - <location filename="../src/gui/accountsettings.cpp" line="902"/> + <location filename="../src/gui/accountsettings.cpp" line="205"/> + <location filename="../src/gui/accountsettings.cpp" line="932"/> <source>Log out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="262"/> + <location filename="../src/gui/accountsettings.cpp" line="265"/> <source>Open local folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="270"/> + <location filename="../src/gui/accountsettings.cpp" line="273"/> <source>Open folder in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="321"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> <source>Resume sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="321"/> + <location filename="../src/gui/accountsettings.cpp" line="324"/> <source>Pause sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="328"/> + <location filename="../src/gui/accountsettings.cpp" line="331"/> <source>Availability</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="345"/> + <location filename="../src/gui/accountsettings.cpp" line="348"/> <source>Disable virtual file support...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="505"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="801"/> + <location filename="../src/gui/accountsettings.cpp" line="816"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="802"/> + <location filename="../src/gui/accountsettings.cpp" line="817"/> <source>%1 of %2 in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="826"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="863"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="877"/> + <location filename="../src/gui/accountsettings.cpp" line="883"/> + <source>Obtaining authorization from the browser.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="896"/> + <source>Server configuration error: %1 at %2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="907"/> <source>No %1 connection configured.</source> <translation type="unfinished"></translation> </message> @@ -649,22 +636,22 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.ui" line="33"/> + <location filename="../src/gui/addcertificatedialog.ui" line="53"/> <source>Certificate & Key (pkcs12) :</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.ui" line="47"/> + <location filename="../src/gui/addcertificatedialog.ui" line="44"/> <source>Browse...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.ui" line="54"/> + <location filename="../src/gui/addcertificatedialog.ui" line="60"/> <source>Certificate password :</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/addcertificatedialog.ui" line="71"/> + <location filename="../src/gui/addcertificatedialog.ui" line="79"/> <source>An encrypted pkcs12 bundle is strongly recommended as a copy will be stored in the configuration file.</source> <translation type="unfinished"></translation> </message> @@ -682,42 +669,42 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="128"/> + <location filename="../src/gui/application.cpp" line="134"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="130"/> + <location filename="../src/gui/application.cpp" line="136"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="142"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="143"/> + <location filename="../src/gui/application.cpp" line="149"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="150"/> <source>Continue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="302"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="305"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation type="unfinished"></translation> </message> @@ -748,7 +735,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1130"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1135"/> <source>Error writing metadata to the database</source> <translation type="unfinished"></translation> </message> @@ -756,32 +743,32 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="47"/> + <location filename="../src/gui/connectionvalidator.cpp" line="46"/> <source>No ownCloud account configured</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="288"/> + <location filename="../src/gui/connectionvalidator.cpp" line="281"/> <source>The configured server for this client is too old</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="289"/> + <location filename="../src/gui/connectionvalidator.cpp" line="282"/> <source>Please update to the latest server and restart the client.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="150"/> + <location filename="../src/gui/connectionvalidator.cpp" line="143"/> <source>Authentication error: Either username or password are wrong.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="162"/> + <location filename="../src/gui/connectionvalidator.cpp" line="155"/> <source>timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="199"/> + <location filename="../src/gui/connectionvalidator.cpp" line="192"/> <source>The provided credentials are not correct</source> <translation type="unfinished"></translation> </message> @@ -789,8 +776,8 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="478"/> - <location filename="../src/libsync/discoveryphase.cpp" line="500"/> + <location filename="../src/libsync/discoveryphase.cpp" line="480"/> + <location filename="../src/libsync/discoveryphase.cpp" line="502"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation type="unfinished"></translation> </message> @@ -798,27 +785,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="248"/> + <location filename="../src/libsync/discoveryphase.cpp" line="259"/> <source>Error while opening directory %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="250"/> + <location filename="../src/libsync/discoveryphase.cpp" line="261"/> <source>Directory not accessible on client, permission denied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="254"/> + <location filename="../src/libsync/discoveryphase.cpp" line="265"/> <source>Directory not found: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="285"/> + <location filename="../src/libsync/discoveryphase.cpp" line="296"/> <source>Filename encoding is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="304"/> + <location filename="../src/libsync/discoveryphase.cpp" line="315"/> <source>Error while reading directory %1</source> <translation type="unfinished"></translation> </message> @@ -826,45 +813,45 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="171"/> + <location filename="../src/gui/folder.cpp" line="172"/> <source>Local folder %1 does not exist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="175"/> <source>%1 should be a folder but is not.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="178"/> <source>%1 is not readable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="414"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="428"/> + <location filename="../src/gui/folder.cpp" line="429"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="435"/> + <location filename="../src/gui/folder.cpp" line="436"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="442"/> + <location filename="../src/gui/folder.cpp" line="443"/> <source>%1 has been moved to %2.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="412"/> + <location filename="../src/gui/folder.cpp" line="413"/> <source>%1 and %n other file(s) have been removed.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -872,7 +859,7 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="419"/> + <location filename="../src/gui/folder.cpp" line="420"/> <source>%1 and %n other file(s) have been added.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -880,13 +867,13 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="422"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="426"/> + <location filename="../src/gui/folder.cpp" line="427"/> <source>%1 and %n other file(s) have been updated.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -894,7 +881,7 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="433"/> + <location filename="../src/gui/folder.cpp" line="434"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -902,7 +889,7 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="440"/> + <location filename="../src/gui/folder.cpp" line="441"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -910,7 +897,7 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="447"/> + <location filename="../src/gui/folder.cpp" line="448"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -918,12 +905,12 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="449"/> + <location filename="../src/gui/folder.cpp" line="450"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="454"/> + <location filename="../src/gui/folder.cpp" line="455"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -931,49 +918,49 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="456"/> + <location filename="../src/gui/folder.cpp" line="457"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="462"/> + <location filename="../src/gui/folder.cpp" line="463"/> <source>Sync Activity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="808"/> + <location filename="../src/gui/folder.cpp" line="810"/> <source>Could not read system exclude file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1056"/> + <location filename="../src/gui/folder.cpp" line="1055"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1058"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1060"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1120"/> + <location filename="../src/gui/folder.cpp" line="1119"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1123"/> + <location filename="../src/gui/folder.cpp" line="1122"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1134"/> + <location filename="../src/gui/folder.cpp" line="1133"/> <source>Changes in synchronized folders could not be tracked reliably. This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default). @@ -982,7 +969,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1209"/> + <location filename="../src/gui/folder.cpp" line="1208"/> <source>All files in the sync folder '%1' folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to keep the files, they will be re-synced with the server if you have rights to do so. @@ -990,24 +977,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1214"/> + <location filename="../src/gui/folder.cpp" line="1213"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1218"/> + <location filename="../src/gui/folder.cpp" line="1217"/> <source>Remove All Files?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1220"/> <source>Remove all files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1222"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Keep files</source> <translation type="unfinished"></translation> </message> @@ -1015,107 +1002,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="353"/> + <location filename="../src/gui/folderman.cpp" line="355"/> <source>Could not reset folder state</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="354"/> + <location filename="../src/gui/folderman.cpp" line="356"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1138"/> + <location filename="../src/gui/folderman.cpp" line="1144"/> <source> (backup)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1143"/> + <location filename="../src/gui/folderman.cpp" line="1149"/> <source> (backup %1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1321"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>Undefined State.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1324"/> + <location filename="../src/gui/folderman.cpp" line="1330"/> <source>Waiting to start syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1333"/> <source>Preparing for sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1336"/> <source>Sync is running.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Sync was successful, unresolved conflicts.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1337"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Last Sync was successful.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1343"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>Setup Error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1346"/> + <location filename="../src/gui/folderman.cpp" line="1352"/> <source>User Abort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1355"/> <source>Sync is paused.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1361"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1363"/> + <location filename="../src/gui/folderman.cpp" line="1369"/> <source>No valid folder selected!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1372"/> + <location filename="../src/gui/folderman.cpp" line="1378"/> <source>The selected path does not exist!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1376"/> + <location filename="../src/gui/folderman.cpp" line="1382"/> <source>The selected path is not a folder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1386"/> <source>You have no permission to write to the selected folder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1445"/> + <location filename="../src/gui/folderman.cpp" line="1451"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1425"/> + <location filename="../src/gui/folderman.cpp" line="1431"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1437"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation type="unfinished"></translation> </message> @@ -1294,7 +1281,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWatcher</name> <message> - <location filename="../src/gui/folderwatcher.cpp" line="115"/> + <location filename="../src/gui/folderwatcher.cpp" line="112"/> <source>The watcher did not receive a test notification.</source> <translation type="unfinished"></translation> </message> @@ -1423,25 +1410,25 @@ If this was an accident and you decide to keep your files, they will be re-synce </message> </context> <context> - <name>OCC::GETFileZsyncJob</name> + <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownloadzsync.cpp" line="149"/> - <source>Unable to parse zsync.</source> + <location filename="../src/libsync/propagatedownload.cpp" line="180"/> + <source>No E-Tag received from server, check Proxy/Gateway</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownloadzsync.cpp" line="171"/> - <source>Failed to get zsync byte ranges.</source> + <location filename="../src/libsync/propagatedownload.cpp" line="187"/> + <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownloadzsync.cpp" line="194"/> - <source>Failed to initialize zsync receive structure.</source> + <location filename="../src/libsync/propagatedownload.cpp" line="197"/> + <source>We received an unexpected download Content-Length.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownloadzsync.cpp" line="319"/> - <source>We received a different E-Tag for delta. Retrying next time.</source> + <location filename="../src/libsync/propagatedownload.cpp" line="224"/> + <source>Server returned wrong content-range</source> <translation type="unfinished"></translation> </message> </context> @@ -1461,131 +1448,125 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="20"/> + <location filename="../src/gui/generalsettings.ui" line="35"/> <source>General Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="40"/> + <location filename="../src/gui/generalsettings.ui" line="55"/> <source>For System Tray</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="260"/> + <location filename="../src/gui/generalsettings.ui" line="184"/> + <source>Network</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="257"/> <source>stable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="265"/> + <location filename="../src/gui/generalsettings.ui" line="262"/> <source>beta</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="53"/> + <location filename="../src/gui/generalsettings.ui" line="68"/> <source>Advanced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="85"/> + <location filename="../src/gui/generalsettings.ui" line="100"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="105"/> - <location filename="../src/gui/generalsettings.ui" line="191"/> + <location filename="../src/gui/generalsettings.ui" line="120"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="129"/> + <location filename="../src/gui/generalsettings.ui" line="144"/> <source>Ask for confirmation before synchronizing external storages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="26"/> + <location filename="../src/gui/generalsettings.ui" line="41"/> <source>&Launch on System Startup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="33"/> + <location filename="../src/gui/generalsettings.ui" line="48"/> <source>Show &Desktop Notifications</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="43"/> + <location filename="../src/gui/generalsettings.ui" line="58"/> <source>Use &Monochrome Icons</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="169"/> - <source>Experimental</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="177"/> - <source>Enable Delta-Synchronization for files larger than</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="216"/> + <location filename="../src/gui/generalsettings.ui" line="213"/> <source>Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="243"/> + <location filename="../src/gui/generalsettings.ui" line="240"/> <source>&Update Channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="349"/> + <location filename="../src/gui/generalsettings.ui" line="346"/> <source>•</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="61"/> + <location filename="../src/gui/generalsettings.ui" line="76"/> <source>Edit &Ignored Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="140"/> + <location filename="../src/gui/generalsettings.ui" line="155"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="157"/> + <location filename="../src/gui/generalsettings.ui" line="172"/> <source>S&how crash reporter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="292"/> + <location filename="../src/gui/generalsettings.ui" line="289"/> <source>&Restart && Update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="266"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="176"/> <source>Change update channel?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="193"/> + <location filename="../src/gui/generalsettings.cpp" line="177"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>Change update channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="207"/> + <location filename="../src/gui/generalsettings.cpp" line="191"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -1593,22 +1574,22 @@ Note that this selects only what pool upgrades are taken from, and that there ar <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> <source>Reading from keychain failed with error: '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> <source>Enter Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="167"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="161"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation type="unfinished"></translation> </message> @@ -1636,54 +1617,54 @@ Note that this selects only what pool upgrades are taken from, and that there ar <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="55"/> + <location filename="../src/gui/ignorelisteditor.ui" line="75"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="75"/> + <location filename="../src/gui/ignorelisteditor.ui" line="57"/> <source>Pattern</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="80"/> + <location filename="../src/gui/ignorelisteditor.ui" line="62"/> <source>Allow Deletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="45"/> + <location filename="../src/gui/ignorelisteditor.ui" line="85"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisteditor.ui" line="121"/> <source>Files or folders matching a pattern will not be synchronized. Changes take effect the next time folders are synchronized. Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="125"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="119"/> <source>Could not open file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="126"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="120"/> <source>Cannot write changes to '%1'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="152"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="146"/> <source>Add Ignore Pattern</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="153"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="147"/> <source>Add a new ignore pattern:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="49"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="43"/> <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> <translation type="unfinished"></translation> </message> @@ -1815,12 +1796,12 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="188"/> + <location filename="../src/libsync/logger.cpp" line="186"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="189"/> + <location filename="../src/libsync/logger.cpp" line="187"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation type="unfinished"></translation> </message> @@ -1892,77 +1873,77 @@ Note that using any logging command line options will override the settings.</so <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/networksettings.ui" line="36"/> + <location filename="../src/gui/networksettings.ui" line="29"/> <source>No Proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/networksettings.ui" line="49"/> + <location filename="../src/gui/networksettings.ui" line="42"/> <source>Use system proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/networksettings.ui" line="59"/> + <location filename="../src/gui/networksettings.ui" line="54"/> <source>Specify proxy manually as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/networksettings.ui" line="80"/> + <location filename="../src/gui/networksettings.ui" line="84"/> <source>Host</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/networksettings.ui" line="100"/> + <location filename="../src/gui/networksettings.ui" line="104"/> <source>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/networksettings.ui" line="131"/> + <location filename="../src/gui/networksettings.ui" line="135"/> <source>Proxy server requires authentication</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/networksettings.ui" line="176"/> + <location filename="../src/gui/networksettings.ui" line="180"/> <source>Note: proxy settings have no effects for accounts on localhost</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/networksettings.ui" line="197"/> + <location filename="../src/gui/networksettings.ui" line="201"/> <source>Download Bandwidth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/networksettings.ui" line="203"/> - <location filename="../src/gui/networksettings.ui" line="282"/> + <location filename="../src/gui/networksettings.ui" line="229"/> + <location filename="../src/gui/networksettings.ui" line="308"/> <source>Limit to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/networksettings.ui" line="248"/> - <location filename="../src/gui/networksettings.ui" line="327"/> + <location filename="../src/gui/networksettings.ui" line="249"/> + <location filename="../src/gui/networksettings.ui" line="331"/> <source>KBytes/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/networksettings.ui" line="210"/> - <location filename="../src/gui/networksettings.ui" line="299"/> + <location filename="../src/gui/networksettings.ui" line="207"/> + <location filename="../src/gui/networksettings.ui" line="286"/> <source>No limit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/networksettings.ui" line="257"/> - <location filename="../src/gui/networksettings.ui" line="289"/> + <location filename="../src/gui/networksettings.ui" line="217"/> + <location filename="../src/gui/networksettings.ui" line="296"/> <source>Limit to 3/4 of estimated bandwidth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/networksettings.ui" line="276"/> + <location filename="../src/gui/networksettings.ui" line="280"/> <source>Upload Bandwidth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/networksettings.ui" line="260"/> - <location filename="../src/gui/networksettings.ui" line="292"/> + <location filename="../src/gui/networksettings.ui" line="220"/> + <location filename="../src/gui/networksettings.ui" line="299"/> <source>Limit automatically</source> <translation type="unfinished"></translation> </message> @@ -2020,37 +2001,68 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OAuth</name> <message> - <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <location filename="../src/libsync/creds/oauth.cpp" line="134"/> <source>Error returned from the server: <em>%1</em></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <location filename="../src/libsync/creds/oauth.cpp" line="137"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/oauth.cpp" line="122"/> + <location filename="../src/libsync/creds/oauth.cpp" line="141"/> <source>Empty JSON from OAuth2 redirect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/oauth.cpp" line="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="146"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/oauth.cpp" line="130"/> - <source>The reply from the server did not contain all expected fields</source> + <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <source>Unsupported token type: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/oauth.cpp" line="134"/> + <location filename="../src/libsync/creds/oauth.cpp" line="151"/> + <source>The reply from the server did not contain all expected fields +:%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="153"/> + <source>Unknown Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="291"/> + <source> Error: Missing field %1 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="157"/> <source><h1>Login Error</h1><p>%1</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/oauth.cpp" line="140"/> + <location filename="../src/libsync/creds/oauth.cpp" line="202"/> + <location filename="../src/libsync/creds/oauth.cpp" line="205"/> + <location filename="../src/libsync/creds/oauth.cpp" line="209"/> + <source>Error while refreshing the token: %1 : %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="214"/> + <source>The reply from the server did not contain all expected fields +:%1 +Received data: %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="235"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation type="unfinished"></translation> </message> @@ -2181,22 +2193,22 @@ for additional privileges during the process.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="43"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> <source>Select a different URL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="62"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> <source>Retry unencrypted over HTTP (insecure)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="69"/> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> <source>Configure client-side TLS certificate</source> <translation type="unfinished"></translation> </message> @@ -2237,7 +2249,7 @@ for additional privileges during the process.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="55"/> <source>Copy link to clipboard</source> <translation type="unfinished"></translation> </message> @@ -2271,12 +2283,12 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="206"/> <source>Invalid URL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="317"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="318"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"></translation> </message> @@ -2284,144 +2296,144 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="255"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="251"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> <source>Trying to connect to %1 at %2...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/> <source>There was an invalid response to an authenticated webdav request</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> <source>Invalid URL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="434"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> <source>Creating local sync folder %1...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/> <source>ok</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="443"/> <source>failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/> <source>Could not create local folder %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="471"/> <source>No remote folder specified!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="477"/> <source>Error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> <source>creating folder on ownCloud: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="506"/> <source>Remote folder %1 created successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/> <source>The folder creation resulted in HTTP error code %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/> <source>Successfully connected to %1!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Connection to %1 could not be established. Please check again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="567"/> <source>Folder rename failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="568"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation type="unfinished"></translation> </message> @@ -2429,44 +2441,44 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="76"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="78"/> <source>%1 Connection Wizard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="248"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="251"/> <source>Enable technical preview feature?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="249"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/> <source>When the "virtual files" mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu. The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="260"/> <source>Enable virtual files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/> <source>Continue to use selective sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="263"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="266"/> <source>Enable experimental feature?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="280"/> <source>Enable experimental placeholder mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="264"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="267"/> <source>When the "virtual files" mode is enabled no files will be downloaded initially. Instead, a tiny "%1" file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu. The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset. @@ -2477,7 +2489,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="278"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="281"/> <source>Stay safe</source> <translation type="unfinished"></translation> </message> @@ -2503,7 +2515,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PollJob</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="148"/> + <location filename="../src/libsync/propagateupload.cpp" line="150"/> <source>Invalid JSON reply from the poll URL</source> <translation type="unfinished"></translation> </message> @@ -2606,42 +2618,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1242"/> + <location filename="../src/libsync/discovery.cpp" line="1246"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1255"/> + <location filename="../src/libsync/discovery.cpp" line="1259"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1167"/> + <location filename="../src/libsync/discovery.cpp" line="1171"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1200"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1205"/> + <location filename="../src/libsync/discovery.cpp" line="1209"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1223"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1368"/> <source>Error while reading the database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1429"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation type="unfinished"></translation> </message> @@ -2649,7 +2661,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="996"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1001"/> <source>Error writing metadata to the database</source> <translation type="unfinished"></translation> </message> @@ -2672,38 +2684,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="641"/> - <source>Download slot finished, but there was no reply!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/propagatedownload.cpp" line="694"/> + <location filename="../src/libsync/propagatedownload.cpp" line="630"/> <source>File was deleted from server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="765"/> + <location filename="../src/libsync/propagatedownload.cpp" line="697"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="772"/> + <location filename="../src/libsync/propagatedownload.cpp" line="704"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="952"/> + <location filename="../src/libsync/propagatedownload.cpp" line="884"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="363"/> - <location filename="../src/libsync/propagatedownload.cpp" line="997"/> + <location filename="../src/libsync/propagatedownload.cpp" line="929"/> <source>File has changed since discovery</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1063"/> + <location filename="../src/libsync/propagatedownload.cpp" line="995"/> <source>Error writing metadata to the database</source> <translation type="unfinished"></translation> </message> @@ -2711,12 +2718,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="234"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"></translation> </message> @@ -2819,33 +2826,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="196"/> + <location filename="../src/libsync/propagateupload.cpp" line="198"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="303"/> + <location filename="../src/libsync/propagateupload.cpp" line="305"/> <source>File Removed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="313"/> + <location filename="../src/libsync/propagateupload.cpp" line="315"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="325"/> + <location filename="../src/libsync/propagateupload.cpp" line="327"/> <source>Local file changed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="207"/> - <location filename="../src/libsync/propagateupload.cpp" line="575"/> + <location filename="../src/libsync/propagateupload.cpp" line="209"/> + <location filename="../src/libsync/propagateupload.cpp" line="578"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="660"/> + <location filename="../src/libsync/propagateupload.cpp" line="663"/> <source>Error writing metadata to the database</source> <translation type="unfinished"></translation> </message> @@ -2853,65 +2860,68 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="76"/> - <source>Failed to get zsync byte ranges.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="634"/> - <source>Failed to generate zsync file.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="701"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="472"/> <source>The local file was removed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="712"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="483"/> <source>Local file changed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="751"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="522"/> <source>Poll URL missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="760"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="767"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="781"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>OCC::PropagateUploadFileTUS</name> + <message> + <location filename="../src/libsync/propagateuploadtus.cpp" line="202"/> + <source>The local file was removed during sync.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/propagateuploadtus.cpp" line="213"/> + <source>Local file changed during sync.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="223"/> <source>Poll URL missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="247"/> <source>The local file was removed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="258"/> <source>Local file changed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="272"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation type="unfinished"></translation> </message> @@ -2982,27 +2992,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/proxyauthdialog.ui" line="26"/> + <location filename="../src/gui/proxyauthdialog.ui" line="35"/> <source>Username:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/proxyauthdialog.ui" line="36"/> + <location filename="../src/gui/proxyauthdialog.ui" line="59"/> <source>Proxy:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/proxyauthdialog.ui" line="43"/> + <location filename="../src/gui/proxyauthdialog.ui" line="26"/> <source>The proxy server needs a username and password.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/proxyauthdialog.ui" line="50"/> + <location filename="../src/gui/proxyauthdialog.ui" line="45"/> <source>Password:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/proxyauthdialog.ui" line="74"/> + <location filename="../src/gui/proxyauthdialog.ui" line="66"/> <source>TextLabel</source> <translation type="unfinished"></translation> </message> @@ -3060,7 +3070,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SettingsDialog</name> <message> - <location filename="../src/gui/settingsdialog.ui" line="14"/> + <location filename="../src/gui/settingsdialog.cpp" line="117"/> <source>Settings</source> <translation type="unfinished"></translation> </message> @@ -3070,41 +3080,46 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="117"/> - <source>General</source> + <location filename="../src/gui/settingsdialog.cpp" line="128"/> + <location filename="../src/gui/settingsdialog.cpp" line="131"/> + <source>Quit %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="124"/> - <source>Network</source> + <location filename="../src/gui/settingsdialog.cpp" line="132"/> + <source>Are you sure you want to quit %1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="134"/> - <location filename="../src/gui/settingsdialog.cpp" line="137"/> - <source>Quit %1</source> + <location filename="../src/gui/settingsdialog.cpp" line="254"/> + <source>Account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="138"/> - <source>Are you sure you want to quit %1?</source> + <location filename="../src/gui/settingsdialog.ui" line="14"/> + <source>MainWindow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="249"/> - <source>Account</source> + <location filename="../src/gui/settingsdialog.ui" line="39"/> + <source>Hide</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/settingsdialog.ui" line="49"/> + <source>toolBar</source> <translation type="unfinished"></translation> </message> </context> <context> <name>OCC::ShareDialog</name> <message> - <location filename="../src/gui/sharedialog.ui" line="60"/> + <location filename="../src/gui/sharedialog.ui" line="22"/> <source>TextLabel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="28"/> + <location filename="../src/gui/sharedialog.ui" line="37"/> <source>share label</source> <translation type="unfinished"></translation> </message> @@ -3114,47 +3129,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.ui" line="50"/> + <location filename="../src/gui/sharedialog.ui" line="59"/> <source>ownCloud Path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="85"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="199"/> + <location filename="../src/gui/sharedialog.cpp" line="197"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="213"/> + <location filename="../src/gui/sharedialog.cpp" line="211"/> <source>Users and Groups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="220"/> + <location filename="../src/gui/sharedialog.cpp" line="218"/> <source>Public Links</source> <translation type="unfinished"></translation> </message> @@ -3167,67 +3182,67 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="207"/> + <location filename="../src/gui/sharelinkwidget.ui" line="147"/> <source>Upload only (File Drop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="220"/> + <location filename="../src/gui/sharelinkwidget.ui" line="160"/> <source>Receive files from others without revealing the contents of the folder.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="237"/> + <location filename="../src/gui/sharelinkwidget.ui" line="124"/> <source>Download / View / Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="297"/> + <location filename="../src/gui/sharelinkwidget.ui" line="269"/> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="304"/> + <location filename="../src/gui/sharelinkwidget.ui" line="276"/> <source>Enter name of new share...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="311"/> + <location filename="../src/gui/sharelinkwidget.ui" line="283"/> <source>&Create</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="364"/> + <location filename="../src/gui/sharelinkwidget.ui" line="336"/> <source>TextLabel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="121"/> + <location filename="../src/gui/sharelinkwidget.ui" line="221"/> <source>Set &password </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="87"/> + <location filename="../src/gui/sharelinkwidget.ui" line="235"/> <source>Set &expiration date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="138"/> + <location filename="../src/gui/sharelinkwidget.ui" line="181"/> <source>Set password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="181"/> + <location filename="../src/gui/sharelinkwidget.ui" line="114"/> <source>Recipients can view or download contents.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="230"/> + <location filename="../src/gui/sharelinkwidget.ui" line="99"/> <source>Download / View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="250"/> + <location filename="../src/gui/sharelinkwidget.ui" line="137"/> <source>Recipients can view, download, edit, delete and upload contents.</source> <translation type="unfinished"></translation> </message> @@ -3374,7 +3389,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="343"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation type="unfinished"></translation> </message> @@ -3408,17 +3423,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="363"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation type="unfinished"></translation> </message> @@ -3435,133 +3450,133 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="493"/> + <location filename="../src/gui/socketapi.cpp" line="558"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="529"/> + <location filename="../src/gui/socketapi.cpp" line="591"/> <source>Context menu share</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="534"/> + <location filename="../src/gui/socketapi.cpp" line="596"/> <source>Context menu share %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="723"/> + <location filename="../src/gui/socketapi.cpp" line="765"/> <source>Confirm deletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="725"/> + <location filename="../src/gui/socketapi.cpp" line="767"/> <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="726"/> + <location filename="../src/gui/socketapi.cpp" line="768"/> <source>Do you want to delete the file <i>%1</i> permanently?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="765"/> + <location filename="../src/gui/socketapi.cpp" line="807"/> <source>Select new location...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="775"/> + <location filename="../src/gui/socketapi.cpp" line="817"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="776"/> + <location filename="../src/gui/socketapi.cpp" line="818"/> <source>Moving file failed: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="783"/> + <location filename="../src/gui/socketapi.cpp" line="825"/> <source>I shared something with you</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="796"/> - <location filename="../src/gui/socketapi.cpp" line="827"/> + <location filename="../src/gui/socketapi.cpp" line="838"/> + <location filename="../src/gui/socketapi.cpp" line="869"/> <source>Share...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="798"/> - <location filename="../src/gui/socketapi.cpp" line="843"/> + <location filename="../src/gui/socketapi.cpp" line="840"/> + <location filename="../src/gui/socketapi.cpp" line="885"/> <source>Copy private link to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="799"/> + <location filename="../src/gui/socketapi.cpp" line="841"/> <source>Send private link by email...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="825"/> + <location filename="../src/gui/socketapi.cpp" line="867"/> <source>Resharing this file is not allowed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="825"/> + <location filename="../src/gui/socketapi.cpp" line="867"/> <source>Resharing this folder is not allowed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="837"/> - <location filename="../src/gui/socketapi.cpp" line="839"/> + <location filename="../src/gui/socketapi.cpp" line="879"/> + <location filename="../src/gui/socketapi.cpp" line="881"/> <source>Copy public link to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="930"/> + <location filename="../src/gui/socketapi.cpp" line="972"/> <source>Open in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="938"/> + <location filename="../src/gui/socketapi.cpp" line="980"/> <source>Show file versions in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="961"/> + <location filename="../src/gui/socketapi.cpp" line="1003"/> <source>Rename...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="964"/> + <location filename="../src/gui/socketapi.cpp" line="1006"/> <source>Rename and upload...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="969"/> + <location filename="../src/gui/socketapi.cpp" line="1011"/> <source>Move and rename...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="972"/> + <location filename="../src/gui/socketapi.cpp" line="1014"/> <source>Move, rename and upload...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="975"/> + <location filename="../src/gui/socketapi.cpp" line="1017"/> <source>Delete local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="980"/> + <location filename="../src/gui/socketapi.cpp" line="1022"/> <source>Move and upload...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="981"/> + <location filename="../src/gui/socketapi.cpp" line="1023"/> <source>Delete</source> <translation type="unfinished"></translation> </message> @@ -3699,7 +3714,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.ui" line="25"/> + <location filename="../src/gui/sslerrordialog.ui" line="32"/> <source>Trust this certificate anyway</source> <translation type="unfinished"></translation> </message> @@ -3788,12 +3803,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1027"/> + <location filename="../src/libsync/syncengine.cpp" line="1024"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1034"/> + <location filename="../src/libsync/syncengine.cpp" line="1031"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"></translation> </message> @@ -3828,23 +3843,15 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1010"/> + <location filename="../src/libsync/syncengine.cpp" line="1007"/> <source>Aborted</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>OCC::SyncLogDialog</name> - <message> - <location filename="../src/gui/synclogdialog.ui" line="14"/> - <source>Synchronisation Log</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="54"/> + <location filename="../src/gui/systray.cpp" line="59"/> <source>%1: %2</source> <translation type="unfinished"></translation> </message> @@ -3852,17 +3859,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="343"/> + <location filename="../src/libsync/theme.cpp" line="341"/> <source><p>Version %2. For more information visit <a href="%3">https://%4</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Hannah von Reth, and others.</small></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="350"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>Copyright ownCloud GmbH</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="351"/> + <location filename="../src/libsync/theme.cpp" line="349"/> <source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source> <translation type="unfinished"></translation> </message> @@ -3870,115 +3877,79 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ValidateChecksumHeader</name> <message> - <location filename="../src/common/checksums.cpp" line="338"/> + <location filename="../src/common/checksums.cpp" line="335"/> <source>The checksum header is malformed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/common/checksums.cpp" line="365"/> + <location filename="../src/common/checksums.cpp" line="362"/> <source>The checksum header contained an unknown checksum type '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/common/checksums.cpp" line="369"/> + <location filename="../src/common/checksums.cpp" line="366"/> <source>The downloaded file does not match the checksum, it will be resumed.</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>OCC::ZsyncGenerateRunnable</name> - <message> - <location filename="../src/libsync/propagatecommonzsync.cpp" line="186"/> - <source>Failed to open input file %1: %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/propagatecommonzsync.cpp" line="195"/> - <source>Failed to open input file: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/propagatecommonzsync.cpp" line="208"/> - <source>Failed to write block sums:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/propagatecommonzsync.cpp" line="229"/> - <source>Failed to write zsync metadata file:</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>OCC::ZsyncSeedRunnable</name> - <message> - <location filename="../src/libsync/propagatecommonzsync.cpp" line="115"/> - <source>Unable to parse zsync file.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/propagatecommonzsync.cpp" line="132"/> - <source>Unable to open file: %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="267"/> <source>Please sign in</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="313"/> <source>Folder %1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>There are no sync folders configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="342"/> + <location filename="../src/gui/owncloudgui.cpp" line="340"/> <source>Open in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="391"/> - <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="389"/> + <location filename="../src/gui/owncloudgui.cpp" line="712"/> <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="395"/> - <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="393"/> + <location filename="../src/gui/owncloudgui.cpp" line="704"/> <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="496"/> + <location filename="../src/gui/owncloudgui.cpp" line="499"/> <source>Recent Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="369"/> + <location filename="../src/gui/owncloudgui.cpp" line="367"/> <source>Managed Folders:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="372"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Open folder '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="344"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open %1 in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="201"/> + <location filename="../src/gui/owncloudgui.cpp" line="199"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation type="unfinished"></translation> </message> @@ -4008,103 +3979,103 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="250"/> + <location filename="../src/gui/owncloudgui.cpp" line="248"/> <source>Disconnected from %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="198"/> <source>Unsupported Server Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="240"/> + <location filename="../src/gui/owncloudgui.cpp" line="238"/> <source>Disconnected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="242"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected from some accounts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="253"/> + <location filename="../src/gui/owncloudgui.cpp" line="251"/> <source>Disconnected from accounts:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="255"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Account %1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="270"/> + <location filename="../src/gui/owncloudgui.cpp" line="268"/> <source>Signed out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> + <location filename="../src/gui/owncloudgui.cpp" line="272"/> <source>Account synchronization is disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="275"/> - <location filename="../src/gui/owncloudgui.cpp" line="328"/> + <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="326"/> <source>Synchronization is paused</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="321"/> <source>Unresolved conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="330"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Error during synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="334"/> + <location filename="../src/gui/owncloudgui.cpp" line="332"/> <source>No sync folders configured</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="380"/> + <location filename="../src/gui/owncloudgui.cpp" line="378"/> <source>Unpause all folders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="383"/> <source>Pause all folders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="680"/> + <location filename="../src/gui/owncloudgui.cpp" line="683"/> <source>Unpause all synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="682"/> + <location filename="../src/gui/owncloudgui.cpp" line="685"/> <source>Unpause synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="690"/> + <location filename="../src/gui/owncloudgui.cpp" line="693"/> <source>Pause all synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="692"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Pause synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="699"/> + <location filename="../src/gui/owncloudgui.cpp" line="702"/> <source>Log out of all accounts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="707"/> + <location filename="../src/gui/owncloudgui.cpp" line="710"/> <source>Log in to all accounts...</source> <translation type="unfinished"></translation> </message> @@ -4115,7 +4086,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="801"/> - <location filename="../src/gui/owncloudgui.cpp" line="1172"/> + <location filename="../src/gui/owncloudgui.cpp" line="1146"/> <source>About %1</source> <translation type="unfinished"></translation> </message> @@ -4160,7 +4131,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="325"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Up to date</source> <translation type="unfinished"></translation> </message> @@ -4174,84 +4145,84 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="81"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="134"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="253"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="361"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="515"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="526"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="52"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="108"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="214"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="317"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="490"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="501"/> <source>TextLabel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="91"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="62"/> <source>Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="415"/> <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="418"/> <source>Start a &clean sync (Erases the local folder!)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="301"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="152"/> <source>Ask for confirmation before synchroni&zing folders larger than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="169"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="327"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="178"/> <source>Ask for confirmation before synchronizing e&xternal storages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="354"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="207"/> <source>Choose what to sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="394"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="397"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/> <source><html><head/><body><p>When this option is selected, the wizard will close without synchronizing anything. You can use the &quot;Add Folder Sync Connection&quot; button from the account settings to choose which pair of local and remote folder you wish to synchronize</p></body></html></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="400"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="253"/> <source>Manually create folder sync connections </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="150"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="333"/> <source>&Local Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="225"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="374"/> <source>pbSelectLocalFolder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="193"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="405"/> <source>&Keep local data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="243"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/> <source>S&ynchronize everything from server (recommended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="435"/> <source>Status message</source> <translation type="unfinished"></translation> </message> @@ -4264,12 +4235,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="54"/> <source>&Username</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="83"/> + <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="64"/> <source>&Password</source> <translation type="unfinished"></translation> </message> @@ -4353,12 +4324,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="448"/> <source>in the future</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="444"/> <source>%n day(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4366,7 +4337,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="452"/> <source>%n hour(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4374,17 +4345,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="457"/> <source>now</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="459"/> <source>Less than a minute ago</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>%n minute(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4392,7 +4363,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Some time ago</source> <translation type="unfinished"></translation> </message> @@ -4426,7 +4397,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="316"/> <source>%n year(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4434,7 +4405,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="317"/> <source>%n month(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4442,7 +4413,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="318"/> <source>%n day(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4450,7 +4421,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="319"/> <source>%n hour(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4458,7 +4429,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="324"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n minute(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4466,7 +4437,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="325"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n second(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4474,7 +4445,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message> - <location filename="../src/common/utility.cpp" line="349"/> + <location filename="../src/common/utility.cpp" line="345"/> <source>%1 %2</source> <translation type="unfinished"></translation> </message> @@ -4495,7 +4466,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="322"/> + <location filename="../src/libsync/theme.cpp" line="320"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"></translation> </message> |