diff options
author | ownClouders <devops@owncloud.com> | 2021-09-07 06:18:07 +0300 |
---|---|---|
committer | ownClouders <devops@owncloud.com> | 2021-09-07 06:18:07 +0300 |
commit | 6052718c9a5e75b8e2c04265d2edddc2c2b4faba (patch) | |
tree | 404af2a7471fc8450ab939e471aeaf1a61c4a4a5 /translations/client_en.ts | |
parent | 264a2d495fa2ca26396c92657fb09c2e8dd22acf (diff) |
[tx] updated client translations from transifex [skip ci]
Diffstat (limited to 'translations/client_en.ts')
-rw-r--r-- | translations/client_en.ts | 99 |
1 files changed, 53 insertions, 46 deletions
diff --git a/translations/client_en.ts b/translations/client_en.ts index 0ae668a6b..918228f8c 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -1161,120 +1161,127 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <source>Could not reset folder state</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <source>Sync was successful, unresolved conflicts.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>The selected path does not exist!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>The selected path is not a folder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <source>You have no permission to write to the selected folder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1314,12 +1321,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation type="unfinished"></translation> </message> @@ -1334,107 +1341,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1442,7 +1449,7 @@ If this was an accident and you decide to keep your files, they will be re-synce </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation type="unfinished"></translation> </message> |