diff options
Diffstat (limited to 'translations/client_en.ts')
| -rw-r--r-- | translations/client_en.ts | 750 |
1 files changed, 306 insertions, 444 deletions
diff --git a/translations/client_en.ts b/translations/client_en.ts index 188fbc7be..b19ed6c25 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -105,34 +105,6 @@ </message> </context> <context> - <name>Flow2AuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> - <source>Browser Authentication</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/wizard/flow2authcredspage.ui" line="70"/> - <source>Copy link</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>Flow2AuthWidget</name> <message> <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> @@ -140,22 +112,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="32"/> <source>Please switch to your browser to proceed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="42"/> <source>An error occurred while connecting. Please try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="52"/> <source>Re-open Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/flow2authwidget.ui" line="82"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="65"/> <source>Copy link</source> <translation type="unfinished"></translation> </message> @@ -169,7 +141,7 @@ </message> <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="44"/> - <source>&Choose...</source> + <source>&Choose …</source> <translation type="unfinished"></translation> </message> </context> @@ -230,11 +202,6 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="211"/> - <source>Storage space: ...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/accountsettings.ui" line="31"/> <source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source> <translation type="unfinished"></translation> @@ -260,9 +227,14 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../src/gui/accountsettings.ui" line="204"/> + <source>Storage space: …</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/gui/accountsettings.ui" line="126"/> - <location filename="../src/gui/accountsettings.cpp" line="803"/> - <location filename="../src/gui/accountsettings.cpp" line="1219"/> + <location filename="../src/gui/accountsettings.cpp" line="759"/> + <location filename="../src/gui/accountsettings.cpp" line="1154"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -272,230 +244,199 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="190"/> + <location filename="../src/gui/accountsettings.cpp" line="187"/> <source>No account configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="220"/> - <source>Add new</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="228"/> - <source>Remove</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="232"/> - <source>Account</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="242"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>This account supports end-to-end encryption</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="244"/> + <location filename="../src/gui/accountsettings.cpp" line="218"/> <source>Enable encryption</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="261"/> - <source>Show E2E mnemonic</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="561"/> <source>Encrypt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="649"/> + <location filename="../src/gui/accountsettings.cpp" line="569"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Edit Ignored Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="653"/> + <location filename="../src/gui/accountsettings.cpp" line="609"/> <source>Choose what to sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="659"/> + <location filename="../src/gui/accountsettings.cpp" line="615"/> <source>Force sync now</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="661"/> + <location filename="../src/gui/accountsettings.cpp" line="617"/> <source>Restart sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="670"/> + <location filename="../src/gui/accountsettings.cpp" line="626"/> <source>Remove folder sync connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="741"/> + <location filename="../src/gui/accountsettings.cpp" line="697"/> <source>Folder creation failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="795"/> + <location filename="../src/gui/accountsettings.cpp" line="751"/> <source>Confirm Folder Sync Connection Removal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="802"/> + <location filename="../src/gui/accountsettings.cpp" line="758"/> <source>Remove Folder Sync Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="887"/> + <location filename="../src/gui/accountsettings.cpp" line="843"/> <source>Sync Running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="888"/> + <location filename="../src/gui/accountsettings.cpp" line="844"/> <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="977"/> + <location filename="../src/gui/accountsettings.cpp" line="933"/> <source>%1 in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1004"/> + <location filename="../src/gui/accountsettings.cpp" line="960"/> <source>%1 as <i>%2</i></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1012"/> + <location filename="../src/gui/accountsettings.cpp" line="968"/> <source>Connected to %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1014"/> + <location filename="../src/gui/accountsettings.cpp" line="970"/> <source>Server %1 is temporarily unavailable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1016"/> + <location filename="../src/gui/accountsettings.cpp" line="972"/> <source>Server %1 is currently in maintenance mode.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1018"/> + <location filename="../src/gui/accountsettings.cpp" line="974"/> <source>Signed out from %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1027"/> + <location filename="../src/gui/accountsettings.cpp" line="983"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1034"/> + <location filename="../src/gui/accountsettings.cpp" line="990"/> <source>No connection to %1 at %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1066"/> - <source>Log in</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="1162"/> + <location filename="../src/gui/accountsettings.cpp" line="1109"/> <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="1164"/> + <location filename="../src/gui/accountsettings.cpp" line="1111"/> <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="1165"/> + <location filename="../src/gui/accountsettings.cpp" line="1112"/> <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="1211"/> + <location filename="../src/gui/accountsettings.cpp" line="1146"/> <source>Confirm Account Removal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1212"/> + <location filename="../src/gui/accountsettings.cpp" line="1147"/> <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="1218"/> + <location filename="../src/gui/accountsettings.cpp" line="1153"/> <source>Remove connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> - <location filename="../src/gui/accountsettings.cpp" line="646"/> + <location filename="../src/gui/accountsettings.cpp" line="545"/> + <location filename="../src/gui/accountsettings.cpp" line="602"/> <source>Open folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="224"/> - <location filename="../src/gui/accountsettings.cpp" line="1068"/> - <source>Log out</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="667"/> + <location filename="../src/gui/accountsettings.cpp" line="623"/> <source>Resume sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="667"/> + <location filename="../src/gui/accountsettings.cpp" line="623"/> <source>Pause sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="742"/> + <location filename="../src/gui/accountsettings.cpp" line="698"/> <source><p>Could not create local folder <i>%1</i>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="796"/> + <location filename="../src/gui/accountsettings.cpp" line="752"/> <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="964"/> + <location filename="../src/gui/accountsettings.cpp" line="920"/> <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="965"/> + <location filename="../src/gui/accountsettings.cpp" line="921"/> <source>%1 of %2 in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="974"/> + <location filename="../src/gui/accountsettings.cpp" line="930"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1031"/> + <location filename="../src/gui/accountsettings.cpp" line="987"/> <source>Connecting to %1 …</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1040"/> + <location filename="../src/gui/accountsettings.cpp" line="996"/> <source>No %1 connection configured.</source> <translation type="unfinished"></translation> </message> @@ -503,102 +444,61 @@ <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="134"/> <source>Signed out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="136"/> <source>Disconnected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="138"/> <source>Connected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="140"/> <source>Service unavailable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="142"/> <source>Maintenance mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="137"/> + <location filename="../src/gui/accountstate.cpp" line="144"/> <source>Network error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="139"/> + <location filename="../src/gui/accountstate.cpp" line="146"/> <source>Configuration error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="141"/> + <location filename="../src/gui/accountstate.cpp" line="148"/> <source>Asking Credentials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="143"/> + <location filename="../src/gui/accountstate.cpp" line="150"/> <source>Unknown account state</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> - <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="229"/> - <source>More information</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="230"/> - <source>Accept</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="231"/> - <source>Join</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="252"/> - <source>Open Browser</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="230"/> + <location filename="../src/gui/tray/ActivityListModel.cpp" line="322"/> <source>Files from the ignore list as well as symbolic links are not synced. This includes:</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>OCC::ActivityWidget</name> - <message> - <location filename="../src/gui/activitywidget.cpp" line="56"/> - <source>Accept</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="192"/> - <source>Synced</source> - <translation type="unfinished"></translation> - </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="231"/> - <source>Retry all uploads</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="346"/> - <source><br/>Account %1 does not have activities enabled.</source> + <location filename="../src/gui/tray/ActivityListModel.cpp" line="424"/> + <source>For more activities please open the Activity app.</source> <translation type="unfinished"></translation> </message> </context> @@ -621,7 +521,7 @@ </message> <message> <location filename="../src/gui/addcertificatedialog.ui" line="51"/> - <source>Browse...</source> + <source>Browse …</source> <translation type="unfinished"></translation> </message> <message> @@ -705,32 +605,32 @@ <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="47"/> - <source>No ownCloud account configured</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="289"/> <source>The configured server for this client is too old</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="283"/> + <location filename="../src/gui/connectionvalidator.cpp" line="290"/> <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="144"/> + <location filename="../src/gui/connectionvalidator.cpp" line="147"/> <source>Authentication error: Either username or password are wrong.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="156"/> + <location filename="../src/gui/connectionvalidator.cpp" line="50"/> + <source>No Nextcloud account configured</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionvalidator.cpp" line="159"/> <source>timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="193"/> + <location filename="../src/gui/connectionvalidator.cpp" line="196"/> <source>The provided credentials are not correct</source> <translation type="unfinished"></translation> </message> @@ -738,7 +638,7 @@ <context> <name>OCC::DiscoveryMainThread</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="631"/> + <location filename="../src/libsync/discoveryphase.cpp" line="638"/> <source>Aborted by the user</source> <translation type="unfinished"></translation> </message> @@ -746,7 +646,7 @@ <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="392"/> + <location filename="../src/libsync/discoveryphase.cpp" line="399"/> <source>The server file discovery reply is missing data.</source> <translation type="unfinished"></translation> </message> @@ -754,26 +654,26 @@ <context> <name>OCC::Flow2Auth</name> <message> - <location filename="../src/gui/creds/flow2auth.cpp" line="76"/> - <location filename="../src/gui/creds/flow2auth.cpp" line="145"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="109"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="212"/> <source>Error returned from the server: <em>%1</em></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/flow2auth.cpp" line="79"/> - <location filename="../src/gui/creds/flow2auth.cpp" line="148"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="112"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="215"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/flow2auth.cpp" line="82"/> - <location filename="../src/gui/creds/flow2auth.cpp" line="151"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="115"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="218"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/flow2auth.cpp" line="85"/> - <location filename="../src/gui/creds/flow2auth.cpp" line="154"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="118"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="221"/> <source>The reply from the server did not contain all expected fields</source> <translation type="unfinished"></translation> </message> @@ -781,28 +681,43 @@ <context> <name>OCC::Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="37"/> <source>Connect to %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="38"/> <source>Login in your browser (Login Flow v2)</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="83"/> - <source>Unable to open the Browser, please copy the link to your Browser.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OCC::Flow2AuthWidget</name> <message> - <location filename="../src/gui/wizard/flow2authwidget.cpp" line="67"/> + <location filename="../src/gui/wizard/flow2authwidget.cpp" line="80"/> <source>Unable to open the Browser, please copy the link to your Browser.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.cpp" line="143"/> + <source>Waiting for authorization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.cpp" line="148"/> + <source>Polling for authorization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.cpp" line="153"/> + <source>Starting authorization</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.cpp" line="157"/> + <source>Link copied to clipboard.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>OCC::Folder</name> @@ -940,34 +855,34 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="970"/> + <location filename="../src/gui/folder.cpp" line="972"/> <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="973"/> + <location filename="../src/gui/folder.cpp" line="975"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="974"/> + <location filename="../src/gui/folder.cpp" line="976"/> <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="1029"/> + <location filename="../src/gui/folder.cpp" line="1031"/> <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="1032"/> + <location filename="../src/gui/folder.cpp" line="1034"/> <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="1043"/> + <location filename="../src/gui/folder.cpp" line="1045"/> <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). @@ -976,7 +891,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="1088"/> + <location filename="../src/gui/folder.cpp" line="1090"/> <source>All files in the sync folder '%1' were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. @@ -984,46 +899,46 @@ 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="1093"/> + <location filename="../src/gui/folder.cpp" line="1095"/> <source>All files got deleted from your local sync folder '%1'. These files will be deleted from the server and will not be available on your other devices if they will not be restored. If this action was unintended you can restore the lost data now.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1097"/> + <location filename="../src/gui/folder.cpp" line="1099"/> <source>Delete all files?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1100"/> + <location filename="../src/gui/folder.cpp" line="1102"/> <source>Delete all files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1103"/> <source>Restore deleted files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <source>This sync would reset the files to an earlier time in the sync folder '%1'. This might be because a backup was restored on the server. Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1123"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Backup detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1126"/> + <location filename="../src/gui/folder.cpp" line="1128"/> <source>Normal Synchronisation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1127"/> + <location filename="../src/gui/folder.cpp" line="1129"/> <source>Keep Local Files as Conflict</source> <translation type="unfinished"></translation> </message> @@ -1144,7 +1059,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="313"/> <source>File</source> <translation type="unfinished"></translation> </message> @@ -1400,22 +1315,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GETFileJob</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="181"/> <source>No E-Tag received from server, check Proxy/Gateway</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="193"/> + <location filename="../src/libsync/propagatedownload.cpp" line="188"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="220"/> + <location filename="../src/libsync/propagatedownload.cpp" line="215"/> <source>Server returned wrong content-range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="332"/> + <location filename="../src/libsync/propagatedownload.cpp" line="325"/> <source>Connection Timeout</source> <translation type="unfinished"></translation> </message> @@ -1513,12 +1428,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GetOrCreatePublicLinkShare</name> <message> - <location filename="../src/gui/socketapi.cpp" line="520"/> + <location filename="../src/gui/socketapi.cpp" line="556"/> + <source>Password for share required</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="557"/> + <source>Please enter a password for your link share:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="576"/> <source>Sharing error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="521"/> + <location filename="../src/gui/socketapi.cpp" line="577"/> <source>Could not retrieve or create the public link share. Error: %1</source> @@ -1645,7 +1570,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from </message> <message> <location filename="../src/gui/legalnotice.cpp" line="27"/> - <source><p>Copyright 2017-2019 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p></source> + <source><p>Copyright 2017-2020 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p></source> <translation type="unfinished"></translation> </message> <message> @@ -2112,13 +2037,13 @@ for additional privileges during the process.</source> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="182"/> - <source>This url is NOT secure as it is not encrypted. + <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="186"/> - <source>This url is secure. You can use it.</source> + <source>This URL is secure. You can use it.</source> <translation type="unfinished"></translation> </message> <message> @@ -2185,104 +2110,104 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="452"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>Creating local sync folder %1 …</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="459"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/> <source>ok</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="463"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/> <source>Could not create local folder %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> <source>No remote folder specified!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> <source>Error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> <source>Remote folder %1 created successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="561"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="563"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="565"/> <source>The folder creation resulted in HTTP error code %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="567"/> <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="570"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="577"/> <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="593"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="594"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="599"/> <source>Successfully connected to %1!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="606"/> <source>Connection to %1 could not be established. Please check again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <source>Folder rename failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="621"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="668"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation type="unfinished"></translation> </message> @@ -2290,12 +2215,12 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="94"/> <source>%1 Connection Wizard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="103"/> <source>Skip folders configuration</source> <translation type="unfinished"></translation> </message> @@ -2337,52 +2262,52 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDownloadFile</name> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="357"/> <source>File %1 can not be downloaded because encryption information is missing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="434"/> + <location filename="../src/libsync/propagatedownload.cpp" line="427"/> <source>File %1 can not be downloaded because of a local file name clash!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="484"/> + <location filename="../src/libsync/propagatedownload.cpp" line="477"/> <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="488"/> + <location filename="../src/libsync/propagatedownload.cpp" line="481"/> <source>Free space on disk is less than %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="608"/> + <location filename="../src/libsync/propagatedownload.cpp" line="601"/> <source>File was deleted from server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="661"/> + <location filename="../src/libsync/propagatedownload.cpp" line="654"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="668"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="857"/> + <location filename="../src/libsync/propagatedownload.cpp" line="850"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="892"/> + <location filename="../src/libsync/propagatedownload.cpp" line="885"/> <source>File has changed since discovery</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="948"/> + <location filename="../src/libsync/propagatedownload.cpp" line="941"/> <source>Error writing metadata to the database</source> <translation type="unfinished"></translation> </message> @@ -2648,7 +2573,7 @@ It is not advisable to use it.</source> <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="153"/> + <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/> <source>Dismiss</source> <translation type="unfinished"></translation> </message> @@ -2661,22 +2586,17 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> - <source>Activity</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/settingsdialog.cpp" line="101"/> + <location filename="../src/gui/settingsdialog.cpp" line="100"/> <source>General</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="110"/> + <location filename="../src/gui/settingsdialog.cpp" line="109"/> <source>Network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="236"/> + <location filename="../src/gui/settingsdialog.cpp" line="207"/> <source>Account</source> <translation type="unfinished"></translation> </message> @@ -2684,26 +2604,36 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareDialog</name> <message> - <location filename="../src/gui/sharedialog.cpp" line="104"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>%1 Sharing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="80"/> + <location filename="../src/gui/sharedialog.cpp" line="81"/> <source>%1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="101"/> + <location filename="../src/gui/sharedialog.cpp" line="102"/> <source>Folder: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="274"/> + <location filename="../src/gui/sharedialog.cpp" line="276"/> <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="311"/> + <source>Password for share required</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="312"/> + <source>Please enter a password for your link share:</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/gui/sharedialog.ui" line="51"/> <source>share label</source> <translation type="unfinished"></translation> @@ -2742,72 +2672,72 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="471"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="470"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="159"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="158"/> <source>Allow Editing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Read only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> <source>Allow Upload && Editing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="175"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="174"/> <source>File Drop (Upload Only)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="190"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="189"/> <source>Add note to recipient</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="200"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="199"/> <source>Password Protect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="217"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="216"/> <source>Expiration Date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="236"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="235"/> <source>Unshare</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="241"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="240"/> <source>Add another link</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="464"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="463"/> <source>Confirm Link Share Deletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="465"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="464"/> <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="472"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="471"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="490"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="489"/> <source>Public link</source> <translation type="unfinished"></translation> </message> @@ -2815,11 +2745,6 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> - <source>Share with users or groups ...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/shareusergroupwidget.cpp" line="270"/> <source>Copy link</source> <translation type="unfinished"></translation> @@ -2834,12 +2759,17 @@ It is not advisable to use it.</source> <source>I shared something with you</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> + <source>Share with users or groups …</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>OCC::ShareUserLine</name> <message> <location filename="../src/gui/shareuserline.ui" line="57"/> - <source>User name</source> + <source>Username</source> <translation type="unfinished"></translation> </message> <message> @@ -2912,60 +2842,54 @@ It is not advisable to use it.</source> <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi.cpp" line="457"/> - <source>Share with %1</source> - <comment>parameter is Nextcloud</comment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/socketapi.cpp" line="491"/> + <location filename="../src/gui/socketapi.cpp" line="529"/> <source>Context menu share</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="612"/> + <location filename="../src/gui/socketapi.cpp" line="668"/> <source>I shared something with you</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="625"/> - <location filename="../src/gui/socketapi.cpp" line="655"/> + <location filename="../src/gui/socketapi.cpp" line="681"/> + <location filename="../src/gui/socketapi.cpp" line="711"/> <source>Share options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="626"/> - <source>Share via %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/socketapi.cpp" line="628"/> + <location filename="../src/gui/socketapi.cpp" line="684"/> <source>Send private link by email …</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="627"/> + <location filename="../src/gui/socketapi.cpp" line="683"/> <source>Copy private link to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="653"/> + <location filename="../src/gui/socketapi.cpp" line="709"/> <source>Resharing this file is not allowed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="666"/> - <location filename="../src/gui/socketapi.cpp" line="668"/> + <location filename="../src/gui/socketapi.cpp" line="722"/> + <location filename="../src/gui/socketapi.cpp" line="724"/> <source>Copy public link</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="672"/> + <location filename="../src/gui/socketapi.cpp" line="728"/> <source>Copy internal link</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="722"/> + <location filename="../src/gui/socketapi.cpp" line="782"/> + <source>Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="784"/> <source>Open in browser</source> <translation type="unfinished"></translation> </message> @@ -3450,7 +3374,7 @@ It is not advisable to use it.</source> <context> <name>OCC::Systray</name> <message> - <location filename="../src/gui/systray.cpp" line="54"/> + <location filename="../src/gui/systray.cpp" line="130"/> <source>%1: %2</source> <translation type="unfinished"></translation> </message> @@ -3458,273 +3382,211 @@ It is not advisable to use it.</source> <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="352"/> + <location filename="../src/libsync/theme.cpp" line="345"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="356"/> + <location filename="../src/libsync/theme.cpp" line="349"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"></translation> </message> </context> <context> - <name>OCC::WebEnginePage</name> + <name>OCC::User</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="208"/> - <source>Invalid certificate detected</source> + <location filename="../src/gui/tray/UserModel.cpp" line="319"/> + <source>Retry all uploads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="209"/> - <source>The host "%1" provided an invalid certificate. Continue?</source> + <location filename="../src/gui/tray/UserModel.cpp" line="368"/> + <source>You renamed</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="166"/> - <source>You have been logged out of %1 as user %2. Please login again</source> + <location filename="../src/gui/tray/UserModel.cpp" line="370"/> + <source>You deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="185"/> - <source>Please login with the user: %1</source> + <location filename="../src/gui/tray/UserModel.cpp" line="372"/> + <source>You created</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="374"/> + <source>You changed</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>OCC::ownCloudGui</name> + <name>OCC::UserModel</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="293"/> - <source>Please sign in</source> + <location filename="../src/gui/tray/UserModel.cpp" line="688"/> + <source>Confirm Account Removal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="339"/> - <source>Folder %1: %2</source> + <location filename="../src/gui/tray/UserModel.cpp" line="689"/> + <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/owncloudgui.cpp" line="357"/> - <source>There are no sync folders configured.</source> + <location filename="../src/gui/tray/UserModel.cpp" line="694"/> + <source>Remove connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="366"/> - <source>Open in browser</source> + <location filename="../src/gui/tray/UserModel.cpp" line="695"/> + <source>Cancel</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="419"/> - <source>Log out</source> + <location filename="../src/gui/wizard/webview.cpp" line="208"/> + <source>Invalid certificate detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="514"/> - <source>Recent Changes</source> + <location filename="../src/gui/wizard/webview.cpp" line="209"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="393"/> - <source>Managed Folders:</source> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="169"/> + <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="396"/> - <source>Open folder '%1'</source> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="189"/> + <source>Please login with the user: %1</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>OCC::WebFlowCredentialsDialog</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> - <source>Open %1 in browser</source> + <location filename="../src/gui/creds/webflowcredentialsdialog.cpp" line="34"/> + <source>Log in</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> - <source>Unknown status</source> + <location filename="../src/gui/owncloudgui.cpp" line="289"/> + <source>Please sign in</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> - <source>Help</source> + <location filename="../src/gui/owncloudgui.cpp" line="335"/> + <source>Folder %1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> - <source>Quit %1</source> + <location filename="../src/gui/owncloudgui.cpp" line="353"/> + <source>There are no sync folders configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Disconnected from %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="220"/> <source>Unsupported Server Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="225"/> + <location filename="../src/gui/owncloudgui.cpp" line="221"/> <source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="264"/> + <location filename="../src/gui/owncloudgui.cpp" line="260"/> <source>Disconnected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="266"/> + <location filename="../src/gui/owncloudgui.cpp" line="262"/> <source>Disconnected from some accounts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="277"/> + <location filename="../src/gui/owncloudgui.cpp" line="273"/> <source>Disconnected from accounts:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="279"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> <source>Account %1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="294"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> <source>Signed out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="298"/> + <location filename="../src/gui/owncloudgui.cpp" line="294"/> <source>Account synchronization is disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="299"/> - <location filename="../src/gui/owncloudgui.cpp" line="352"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Synchronization is paused</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="347"/> + <location filename="../src/gui/owncloudgui.cpp" line="343"/> <source>Unresolved conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="350"/> <source>Error during synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="358"/> + <location filename="../src/gui/owncloudgui.cpp" line="354"/> <source>No sync folders configured</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="404"/> - <source>Resume all folders</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="409"/> - <source>Pause all folders</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="415"/> - <source>Log in …</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="692"/> - <source>Resume all synchronization</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> - <source>Resume synchronization</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="702"/> - <source>Pause all synchronization</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="704"/> - <source>Pause synchronization</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="937"/> + <location filename="../src/gui/owncloudgui.cpp" line="418"/> <source>Syncing %1 of %2 (%3 left)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="794"/> - <source>Crash now</source> - <comment>Only shows in debug mode to allow testing the crash handler</comment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> - <source>Apps</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="780"/> - <source>Settings …</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="781"/> - <source>New account …</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>View more activity …</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="897"/> - <source>No items synced recently</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="919"/> - <source>Checking for changes in remote '%1'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="922"/> - <source>Checking for changes in local '%1'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="942"/> + <location filename="../src/gui/owncloudgui.cpp" line="423"/> <source>Syncing %1 of %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="951"/> + <location filename="../src/gui/owncloudgui.cpp" line="432"/> <source>Syncing %1 (%2 left)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="954"/> + <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Syncing %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="972"/> + <location filename="../src/gui/owncloudgui.cpp" line="445"/> <source>%1 (%2, %3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="349"/> + <location filename="../src/gui/owncloudgui.cpp" line="345"/> <source>Up to date</source> <translation type="unfinished"></translation> </message> @@ -4032,7 +3894,7 @@ It is not advisable to use it.</source> <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="336"/> + <location filename="../src/libsync/theme.cpp" line="329"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"></translation> </message> |