diff options
Diffstat (limited to 'translations/client_en_GB.ts')
| -rw-r--r-- | translations/client_en_GB.ts | 787 |
1 files changed, 324 insertions, 463 deletions
diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index 5c0f97fd3..d167b05d9 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -103,34 +103,6 @@ </message> </context> <context> - <name>Flow2AuthCredsPage</name> - <message> - <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> - <source>Browser Authentication</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> - <source>Please switch to your browser to proceed.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> - <source>An error occurred while connecting. Please try again.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> - <source>Re-open Browser</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/flow2authcredspage.ui" line="70"/> - <source>Copy link</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>Flow2AuthWidget</name> <message> <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> @@ -138,22 +110,22 @@ <translation type="unfinished"/> </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"/> </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"/> </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"/> </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"/> </message> @@ -167,8 +139,8 @@ </message> <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="44"/> - <source>&Choose...</source> - <translation>&Choose...</translation> + <source>&Choose …</source> + <translation type="unfinished"/> </message> </context> <context> @@ -228,11 +200,6 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="211"/> - <source>Storage space: ...</source> - <translation>Storage space: ...</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>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronised to this computer any more</translation> @@ -258,9 +225,14 @@ <translation>Apply</translation> </message> <message> + <location filename="../src/gui/accountsettings.ui" line="204"/> + <source>Storage space: …</source> + <translation type="unfinished"/> + </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>Cancel</translation> </message> @@ -270,230 +242,199 @@ <translation>Connected with <server> as <user></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>No account configured.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="220"/> - <source>Add new</source> - <translation>Add new</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="228"/> - <source>Remove</source> - <translation>Remove</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="232"/> - <source>Account</source> - <translation>Account</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"/> </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"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="261"/> - <source>Show E2E mnemonic</source> - <translation>Show E2E mnemonic</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="561"/> <source>Encrypt</source> <translation>Encrypt</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"/> </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>Choose what to sync</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>Force sync now</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="661"/> + <location filename="../src/gui/accountsettings.cpp" line="617"/> <source>Restart sync</source> <translation>Restart sync</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>Remove folder sync connection</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>Folder creation failed</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>Confirm Folder Sync Connection Removal</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>Remove Folder Sync Connection</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="887"/> + <location filename="../src/gui/accountsettings.cpp" line="843"/> <source>Sync Running</source> <translation>Sync Running</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>The syncing operation is running.<br/>Do you want to terminate it?</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>%1 in use</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>%1 as <i>%2</i></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>The server version %1 is old and unsupported! Proceed at your own risk.</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>Connected to %1.</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>Server %1 is temporarily unavailable.</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>Server %1 is currently in maintenance mode.</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>Signed out from %1.</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>Obtaining authorisation from the browser. <a href='%1'>Click here</a> to re-open the browser.</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>No connection to %1 at %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1066"/> - <source>Log in</source> - <translation>Log in</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>There are folders that were not synchronised because they are too big: </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>There are folders that were not synchronised because they are external storages: </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>There are folders that were not synchronised because they are too big or external storages: </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>Confirm Account Removal</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><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></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1218"/> + <location filename="../src/gui/accountsettings.cpp" line="1153"/> <source>Remove connection</source> <translation>Remove connection</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>Open folder</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="224"/> - <location filename="../src/gui/accountsettings.cpp" line="1068"/> - <source>Log out</source> - <translation>Log out</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="667"/> + <location filename="../src/gui/accountsettings.cpp" line="623"/> <source>Resume sync</source> <translation>Resume sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="667"/> + <location filename="../src/gui/accountsettings.cpp" line="623"/> <source>Pause sync</source> <translation>Pause sync</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"/> </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><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></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>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</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>%1 of %2 in use</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>Currently there is no storage usage information available.</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"/> </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>No %1 connection configured.</translation> </message> @@ -501,104 +442,63 @@ <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>Signed out</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="136"/> <source>Disconnected</source> <translation>Disconnected</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="138"/> <source>Connected</source> <translation>Connected</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="140"/> <source>Service unavailable</source> <translation>Service unavailable</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="142"/> <source>Maintenance mode</source> <translation>Maintenance mode</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="137"/> + <location filename="../src/gui/accountstate.cpp" line="144"/> <source>Network error</source> <translation>Network error</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="139"/> + <location filename="../src/gui/accountstate.cpp" line="146"/> <source>Configuration error</source> <translation>Configuration error</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="141"/> + <location filename="../src/gui/accountstate.cpp" line="148"/> <source>Asking Credentials</source> <translation>Asking Credentials</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>Unknown account state</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> - <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="229"/> - <source>More information</source> - <translation>More information</translation> - </message> - <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="230"/> - <source>Accept</source> - <translation>Accept</translation> - </message> - <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="231"/> - <source>Join</source> - <translation>Join</translation> - </message> - <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="252"/> - <source>Open Browser</source> - <translation>Open Browser</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"/> </message> -</context> -<context> - <name>OCC::ActivityWidget</name> - <message> - <location filename="../src/gui/activitywidget.cpp" line="56"/> - <source>Accept</source> - <translation>Accept</translation> - </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="192"/> - <source>Synced</source> + <location filename="../src/gui/tray/ActivityListModel.cpp" line="424"/> + <source>For more activities please open the Activity app.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="231"/> - <source>Retry all uploads</source> - <translation>Retry all uploads</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="346"/> - <source><br/>Account %1 does not have activities enabled.</source> - <translation><br/>Account %1 does not have activities enabled.</translation> - </message> </context> <context> <name>OCC::AddCertificateDialog</name> @@ -619,8 +519,8 @@ </message> <message> <location filename="../src/gui/addcertificatedialog.ui" line="51"/> - <source>Browse...</source> - <translation>Browse...</translation> + <source>Browse …</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/addcertificatedialog.ui" line="60"/> @@ -703,32 +603,32 @@ <context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="47"/> - <source>No ownCloud account configured</source> - <translation>No ownCloud account configured</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>The configured server for this client is too old</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>Please update to the latest server and restart the client.</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>Authentication error: Either username or password are wrong.</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"/> + </message> + <message> + <location filename="../src/gui/connectionvalidator.cpp" line="159"/> <source>timeout</source> <translation>timeout</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>The provided credentials are not correct</translation> </message> @@ -736,7 +636,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>Aborted by the user</translation> </message> @@ -744,7 +644,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>The server file discovery reply is missing data.</translation> </message> @@ -752,26 +652,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"/> </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"/> </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"/> </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"/> </message> @@ -779,28 +679,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"/> </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"/> </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"/> - </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"/> </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.cpp" line="143"/> + <source>Waiting for authorization</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.cpp" line="148"/> + <source>Polling for authorization</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.cpp" line="153"/> + <source>Starting authorization</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.cpp" line="157"/> + <source>Link copied to clipboard.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::Folder</name> @@ -914,36 +829,36 @@ <translation>Could not read system exclude file</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>A new folder larger than %1 MB has been added: %2. </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>A folder from an external storage has been added. </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>Please go in the settings to select it if you wish to download it.</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>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</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>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</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). @@ -956,7 +871,7 @@ This means that the synchronization client might not upload local changes immedi %1</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. @@ -964,29 +879,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </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"/> </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"/> </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"/> </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"/> </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> @@ -995,17 +910,17 @@ 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?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1123"/> + <location filename="../src/gui/folder.cpp" line="1125"/> <source>Backup detected</source> <translation>Backup detected</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1126"/> + <location filename="../src/gui/folder.cpp" line="1128"/> <source>Normal Synchronisation</source> <translation>Normal Synchronisation</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>Keep Local Files as Conflict</translation> </message> @@ -1126,7 +1041,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="313"/> <source>File</source> <translation>File</translation> </message> @@ -1379,22 +1294,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>No E-Tag received from server, check Proxy/Gateway</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>We received a different E-Tag for resuming. Retrying next time.</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>Server returned wrong content-range</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="332"/> + <location filename="../src/libsync/propagatedownload.cpp" line="325"/> <source>Connection Timeout</source> <translation>Connection Timeout</translation> </message> @@ -1492,12 +1407,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"/> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="557"/> + <source>Please enter a password for your link share:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="576"/> <source>Sharing error</source> <translation>Sharing error</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> @@ -1626,7 +1551,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"/> </message> <message> @@ -2096,15 +2021,14 @@ for additional privileges during the process.</translation> </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>This url is NOT secure as it is not encrypted. -It is not advisable to use it.</translation> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="186"/> - <source>This url is secure. You can use it.</source> - <translation>This url is secure. You can use it.</translation> + <source>This URL is secure. You can use it.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="225"/> @@ -2170,104 +2094,104 @@ It is not advisable to use it.</translation> <translation type="unfinished"/> </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>Local sync folder %1 already exists, setting it up for sync.<br/><br/></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"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="459"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>failed.</source> <translation>failed.</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>Could not create local folder %1</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>No remote folder specified!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> <source>Error: %1</source> <translation>Error: %1</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>creating folder on Nextcloud: %1</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>Remote folder %1 created successfully.</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>The remote folder %1 already exists. Connecting it for syncing.</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>The folder creation resulted in HTTP error code %1</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>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></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><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></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>Remote folder %1 creation failed with error <tt>%2</tt>.</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>A sync connection from %1 to remote directory %2 was set up.</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>Successfully connected to %1!</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>Connection to %1 could not be established. Please check again.</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>Folder rename failed</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>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.</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><font color="green"><b>Local sync folder %1 successfully created!</b></font></translation> </message> @@ -2275,12 +2199,12 @@ It is not advisable to use it.</translation> <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>%1 Connection Wizard</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>Skip folders configuration</translation> </message> @@ -2322,52 +2246,52 @@ It is not advisable to use it.</translation> <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>File %1 can not be downloaded because encryption information is missing.</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>File %1 can not be downloaded because of a local file name clash!</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>The download would reduce free local disk space below the limit</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>Free space on disk is less than %1</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>File was deleted from server</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>The file could not be downloaded completely.</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"/> </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>File %1 cannot be saved because of a local file name clash!</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>File has changed since discovery</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>Error writing metadata to the database</translation> </message> @@ -2633,7 +2557,7 @@ It is not advisable to use it.</translation> <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>Dismiss</translation> </message> @@ -2646,22 +2570,17 @@ It is not advisable to use it.</translation> <translation>Settings</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> - <source>Activity</source> - <translation>Activity</translation> - </message> - <message> - <location filename="../src/gui/settingsdialog.cpp" line="101"/> + <location filename="../src/gui/settingsdialog.cpp" line="100"/> <source>General</source> <translation>General</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="110"/> + <location filename="../src/gui/settingsdialog.cpp" line="109"/> <source>Network</source> <translation>Network</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="236"/> + <location filename="../src/gui/settingsdialog.cpp" line="207"/> <source>Account</source> <translation>Account</translation> </message> @@ -2669,26 +2588,36 @@ It is not advisable to use it.</translation> <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>%1 Sharing</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="80"/> + <location filename="../src/gui/sharedialog.cpp" line="81"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="101"/> + <location filename="../src/gui/sharedialog.cpp" line="102"/> <source>Folder: %2</source> <translation>Folder: %2</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>The file can not be shared because it was shared without sharing permission.</translation> </message> <message> + <location filename="../src/gui/sharedialog.cpp" line="311"/> + <source>Password for share required</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="312"/> + <source>Please enter a password for your link share:</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/sharedialog.ui" line="51"/> <source>share label</source> <translation>share label</translation> @@ -2727,72 +2656,72 @@ It is not advisable to use it.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="471"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="470"/> <source>Delete</source> <translation>Delete</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="159"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="158"/> <source>Allow Editing</source> <translation>Allow Editing</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Read only</source> <translation>Read only</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>Allow Upload && Editing</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>File Drop (Upload Only)</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"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="200"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="199"/> <source>Password Protect</source> <translation>Password Protect</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="217"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="216"/> <source>Expiration Date</source> <translation>Expiration Date</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="236"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="235"/> <source>Unshare</source> <translation>Unshare</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"/> </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>Confirm Link Share Deletion</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><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="472"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="471"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="490"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="489"/> <source>Public link</source> <translation>Public link</translation> </message> @@ -2800,11 +2729,6 @@ It is not advisable to use it.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> - <source>Share with users or groups ...</source> - <translation>Share with users or groups ...</translation> - </message> - <message> <location filename="../src/gui/shareusergroupwidget.cpp" line="270"/> <source>Copy link</source> <translation>Copy link</translation> @@ -2819,13 +2743,18 @@ It is not advisable to use it.</translation> <source>I shared something with you</source> <translation>I shared something with you</translation> </message> + <message> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> + <source>Share with users or groups …</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::ShareUserLine</name> <message> <location filename="../src/gui/shareuserline.ui" line="57"/> - <source>User name</source> - <translation>User name</translation> + <source>Username</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/shareuserline.ui" line="89"/> @@ -2897,60 +2826,54 @@ It is not advisable to use it.</translation> <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>Share with %1</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>Context menu share</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>I shared something with you</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"/> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="626"/> - <source>Share via %1</source> - <translation type="unfinished"/> - </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"/> </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>Copy private link to clipboard</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>Resharing this file is not allowed</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"/> </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"/> </message> <message> - <location filename="../src/gui/socketapi.cpp" line="722"/> + <location filename="../src/gui/socketapi.cpp" line="782"/> + <source>Edit</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="784"/> <source>Open in browser</source> <translation>Open in browser</translation> </message> @@ -3437,7 +3360,7 @@ It is not advisable to use it.</translation> <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>%1: %2</translation> </message> @@ -3445,17 +3368,68 @@ It is not advisable to use it.</translation> <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"/> </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><p>This release was supplied by %1</p></translation> </message> </context> <context> + <name>OCC::User</name> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="319"/> + <source>Retry all uploads</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="368"/> + <source>You renamed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="370"/> + <source>You deleted</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="372"/> + <source>You created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="374"/> + <source>You changed</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::UserModel</name> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="688"/> + <source>Confirm Account Removal</source> + <translation type="unfinished"/> + </message> + <message> + <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"/> + </message> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="694"/> + <source>Remove connection</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/tray/UserModel.cpp" line="695"/> + <source>Cancel</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="208"/> @@ -3471,247 +3445,134 @@ It is not advisable to use it.</translation> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="166"/> + <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>You have been logged out of %1 as user %2. Please login again</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="185"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="189"/> <source>Please login with the user: %1</source> <translation>Please login with the user: %1</translation> </message> </context> <context> + <name>OCC::WebFlowCredentialsDialog</name> + <message> + <location filename="../src/gui/creds/webflowcredentialsdialog.cpp" line="34"/> + <source>Log in</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="293"/> + <location filename="../src/gui/owncloudgui.cpp" line="289"/> <source>Please sign in</source> <translation>Please sign in</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="339"/> + <location filename="../src/gui/owncloudgui.cpp" line="335"/> <source>Folder %1: %2</source> <translation>Folder %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="357"/> + <location filename="../src/gui/owncloudgui.cpp" line="353"/> <source>There are no sync folders configured.</source> <translation>There are no sync folders configured.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="366"/> - <source>Open in browser</source> - <translation>Open in browser</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="419"/> - <source>Log out</source> - <translation>Log out</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="514"/> - <source>Recent Changes</source> - <translation>Recent Changes</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="393"/> - <source>Managed Folders:</source> - <translation>Managed Folders:</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="396"/> - <source>Open folder '%1'</source> - <translation>Open folder '%1'</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> - <source>Open %1 in browser</source> - <translation>Open %1 in browser</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> - <source>Unknown status</source> - <translation>Unknown status</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> - <source>Help</source> - <translation>Help</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> - <source>Quit %1</source> - <translation>Quit %1</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>Disconnected from %1</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>Unsupported Server Version</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>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.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="264"/> + <location filename="../src/gui/owncloudgui.cpp" line="260"/> <source>Disconnected</source> <translation>Disconnected</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>Disconnected from some accounts</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>Disconnected from accounts:</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>Account %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="294"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> <source>Signed out</source> <translation>Signed out</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>Account synchronisation is disabled</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>Synchronisation is paused</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="347"/> + <location filename="../src/gui/owncloudgui.cpp" line="343"/> <source>Unresolved conflicts</source> <translation>Unresolved conflicts</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>Error during synchronisation</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>No sync folders configured</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="404"/> - <source>Resume all folders</source> - <translation>Resume all folders</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="409"/> - <source>Pause all folders</source> - <translation>Pause all folders</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="415"/> - <source>Log in …</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="692"/> - <source>Resume all synchronization</source> - <translation>Resume all synchronization</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> - <source>Resume synchronization</source> - <translation>Resume synchronization</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="702"/> - <source>Pause all synchronization</source> - <translation>Pause all synchronisation</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="704"/> - <source>Pause synchronization</source> - <translation>Pause synchronisation</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"/> </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>Crash now</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> - <source>Apps</source> - <translation>Apps</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="780"/> - <source>Settings …</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="781"/> - <source>New account …</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>View more activity …</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="897"/> - <source>No items synced recently</source> - <translation>No items synced recently</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="919"/> - <source>Checking for changes in remote '%1'</source> - <translation>Checking for changes in remote '%1'</translation> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="922"/> - <source>Checking for changes in local '%1'</source> - <translation>Checking for changes in local '%1'</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>Syncing %1 of %2</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>Syncing %1 (%2 left)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="954"/> + <location filename="../src/gui/owncloudgui.cpp" line="435"/> <source>Syncing %1</source> <translation>Syncing %1</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>%1 (%2, %3)</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>Up to date</translation> </message> @@ -3983,7 +3844,7 @@ It is not advisable to use it.</translation> <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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></translation> </message> |