diff options
| author | ownClouders <devops@owncloud.com> | 2021-08-05 16:23:07 +0300 |
|---|---|---|
| committer | ownClouders <devops@owncloud.com> | 2021-08-05 16:23:07 +0300 |
| commit | 2d0d866d35e35e1350154381eb5b50148595bd8f (patch) | |
| tree | b7bb5b93b84e981df75e9ffbc339e4982d05de21 /translations/client_en.ts | |
| parent | d6ea1aa17d1aa059e22e4d4aa0e4bf9a7aa4cb58 (diff) | |
[tx] updated client translations from transifex [skip ci]
Diffstat (limited to 'translations/client_en.ts')
| -rw-r--r-- | translations/client_en.ts | 1575 |
1 files changed, 846 insertions, 729 deletions
diff --git a/translations/client_en.ts b/translations/client_en.ts index ac6b71ae1..02330d51b 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -78,36 +78,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <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="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation type="unfinished"></translation> </message> @@ -212,17 +212,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation type="unfinished"></translation> </message> @@ -230,7 +230,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation type="unfinished"></translation> </message> @@ -284,9 +284,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -296,67 +296,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <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. @@ -365,183 +365,183 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <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="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <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="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <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="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <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="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <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="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <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="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <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="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <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="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation type="unfinished"></translation> </message> @@ -549,114 +549,121 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> - <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> <source>%1 %2 on %3</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> - <source>Server Activity</source> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> - <source>Sync Protocol</source> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> - <source>Not Synced</source> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> - <source>Not Synced (%1)</source> - <extracomment>%1 is the number of not synced files.</extracomment> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="613"/> - <source>The server activity list has been copied to the clipboard.</source> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> + <source>Server Activity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="617"/> - <source>The sync activity list has been copied to the clipboard.</source> + <location filename="../src/gui/activitywidget.cpp" line="488"/> + <source>Sync Protocol</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="620"/> - <source>The list of unsynced items has been copied to the clipboard.</source> + <location filename="../src/gui/activitywidget.cpp" line="534"/> + <source>Not Synced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="625"/> - <source>Copied to clipboard</source> + <location filename="../src/gui/activitywidget.cpp" line="537"/> + <source>Not Synced (%1)</source> + <extracomment>%1 is the number of not synced files.</extracomment> <translation type="unfinished"></translation> </message> </context> @@ -670,32 +677,27 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <source>%n notifications(s) for %1.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -703,7 +705,7 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <source>%n notifications(s) for %1 and %2.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -711,17 +713,27 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation type="unfinished"></translation> </message> @@ -772,43 +784,130 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <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="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <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="313"/> - <source>Quit ownCloud</source> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> <translation type="unfinished"></translation> </message> </context> @@ -836,51 +935,51 @@ This action will abort any currently running synchronization.</source> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <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="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation type="unfinished"></translation> </message> @@ -888,27 +987,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation type="unfinished"></translation> </message> @@ -916,45 +1015,45 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <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="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <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="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <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="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -962,7 +1061,7 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -970,13 +1069,13 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <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="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -984,7 +1083,7 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -992,7 +1091,7 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1000,7 +1099,7 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1008,12 +1107,12 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <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="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <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> @@ -1021,49 +1120,49 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <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="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <source>Could not read system exclude file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <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="1049"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1050"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1072,7 +1171,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="1199"/> + <location filename="../src/gui/folder.cpp" line="1197"/> <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. @@ -1080,24 +1179,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="1204"/> + <location filename="../src/gui/folder.cpp" line="1202"/> <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="1208"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation type="unfinished"></translation> </message> @@ -1105,107 +1204,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <source>Could not reset folder state</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path is not a folder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <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="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1226,154 +1325,154 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1381,7 +1480,7 @@ If this was an accident and you decide to keep your files, they will be re-synce </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation type="unfinished"></translation> </message> @@ -1405,12 +1504,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation type="unfinished"></translation> </message> @@ -1446,42 +1545,42 @@ 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/folderwizard.cpp" line="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <source>Failed to list a folder. Error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <source>Choose this to sync the entire account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"></translation> </message> @@ -1489,17 +1588,17 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"></translation> </message> @@ -1561,47 +1660,52 @@ 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="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation type="unfinished"></translation> </message> @@ -1611,18 +1715,18 @@ 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="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <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="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation type="unfinished"></translation> </message> @@ -1637,82 +1741,115 @@ 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="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <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="334"/> <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="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <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="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <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="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1790,69 +1927,22 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation type="unfinished"></translation> </message> @@ -1921,6 +2011,19 @@ Note that using any logging command line options will override the settings.</so </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2115,73 +2218,72 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <source>Error returned from the server: <em>%1</em></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <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="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <source><h1>Login Error</h1><p>%1</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <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="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2273,71 +2375,38 @@ for additional privileges during the process.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <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="41"/> - <source>Select a different URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <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="55"/> - <source>Configure client-side TLS certificate</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2358,17 +2427,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation type="unfinished"></translation> </message> @@ -2384,38 +2453,43 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <source>This url is secure. You can use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"></translation> </message> @@ -2423,72 +2497,57 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <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="368"/> - <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="359"/> - <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="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <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="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <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="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <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> @@ -2546,147 +2605,134 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <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="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <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="1204"/> <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="1349"/> <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="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation type="unfinished"></translation> </message> @@ -2694,84 +2740,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> <translation type="unfinished"></translation> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <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="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> <translation type="unfinished"></translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"></translation> </message> - <message> - <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> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2782,17 +2833,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> - <source>Attention, possible case sensitivity clash with %1</source> + <source>Can not create local folder %1 because of a local file name clash with %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> - <source>could not create folder %1</source> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="179"/> - <source>Error writing metadata to the database</source> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> + <source>could not create folder %1</source> <translation type="unfinished"></translation> </message> </context> @@ -2800,30 +2856,39 @@ This is a new, experimental mode. If you decide to use it, please report any iss <name>OCC::PropagateLocalRemove</name> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> - <source>Could not remove %1 because of a local file name clash</source> + <source>Could not remove %1 because of a local file name clash with %2!</source> <translation type="unfinished"></translation> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation type="unfinished"></translation> </message> @@ -2831,7 +2896,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation type="unfinished"></translation> </message> @@ -2839,30 +2904,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> <translation type="unfinished"></translation> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation type="unfinished"></translation> @@ -2874,73 +2953,86 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <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="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <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> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> <translation type="unfinished"></translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <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="539"/> + <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="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation type="unfinished"></translation> </message> @@ -2953,12 +3045,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/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <source>The local file was removed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation type="unfinished"></translation> </message> @@ -2971,81 +3063,99 @@ 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/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> + <source>Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> + <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> + <source>Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> - <source>Time</source> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> - <source>File</source> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> - <source>Folder</source> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> + <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> - <source>Action</source> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> - <source>Size</source> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> <translation type="unfinished"></translation> </message> </context> @@ -3085,7 +3195,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation type="unfinished"></translation> </message> @@ -3113,13 +3223,13 @@ 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/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation type="unfinished"></translation> </message> @@ -3127,7 +3237,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation type="unfinished"></translation> </message> @@ -3199,42 +3309,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/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="88"/> + <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="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <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="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation type="unfinished"></translation> </message> @@ -3339,7 +3449,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation type="unfinished"></translation> </message> @@ -3374,28 +3484,28 @@ 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.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation type="unfinished"></translation> </message> @@ -3406,7 +3516,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation type="unfinished"></translation> </message> @@ -3429,32 +3539,32 @@ 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="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation type="unfinished"></translation> </message> @@ -3488,17 +3598,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="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation type="unfinished"></translation> </message> @@ -3515,18 +3625,18 @@ 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/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation type="unfinished"></translation> </message> @@ -3563,85 +3673,89 @@ 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/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation type="unfinished"></translation> </message> @@ -3649,37 +3763,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"></translation> </message> @@ -3689,7 +3803,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/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"></translation> </message> @@ -3910,73 +4024,71 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="416"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <source>Using virtual files with suffix, but suffix is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="515"/> + <location filename="../src/libsync/syncengine.cpp" line="444"/> <source>Unable to read the blacklist from the local database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="546"/> + <location filename="../src/libsync/syncengine.cpp" line="477"/> <source>Unable to read from the sync journal.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="630"/> + <location filename="../src/libsync/syncengine.cpp" line="565"/> <source>Cannot open the sync journal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3987,7 +4099,7 @@ 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="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</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, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"></translation> </message> @@ -4031,56 +4143,56 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation type="unfinished"></translation> </message> @@ -4090,32 +4202,32 @@ 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="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation type="unfinished"></translation> </message> @@ -4125,151 +4237,151 @@ 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="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4308,6 +4420,11 @@ 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/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4350,11 +4467,6 @@ 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/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation type="unfinished"></translation> @@ -4404,28 +4516,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation type="unfinished"></translation> </message> @@ -4457,12 +4574,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="454"/> <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="450"/> <source>%n day(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4470,7 +4587,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="458"/> <source>%n hour(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4478,17 +4595,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="463"/> <source>now</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <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="468"/> <source>%n minute(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4496,7 +4613,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="471"/> <source>Some time ago</source> <translation type="unfinished"></translation> </message> @@ -4530,7 +4647,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="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4538,7 +4655,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="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4546,7 +4663,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4554,7 +4671,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="323"/> <source>%n hour(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4562,7 +4679,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="324"/> <source>%n minute(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4570,7 +4687,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="325"/> <source>%n second(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4578,7 +4695,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="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation type="unfinished"></translation> </message> @@ -4599,15 +4716,15 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> <translation type="unfinished"></translation> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"></translation> </message> @@ -4615,7 +4732,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation type="unfinished"></translation> </message> @@ -4723,52 +4840,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation type="unfinished"></translation> </message> |