Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNextcloud bot <bot@nextcloud.com>2019-11-05 06:05:20 +0300
committerNextcloud bot <bot@nextcloud.com>2019-11-05 06:05:20 +0300
commite85ad9de6ae39d4c1313ca55cec5a09163d5af1a (patch)
tree130de15c65ab3ceddae83e02dc9640e495e2ba88 /translations/client_en.ts
parent0ab5bbb08e436a7f6b25d0e11e7bf26a730ec1b2 (diff)
[tx-robot] updated from transifex
Diffstat (limited to 'translations/client_en.ts')
-rw-r--r--translations/client_en.ts44
1 files changed, 22 insertions, 22 deletions
diff --git a/translations/client_en.ts b/translations/client_en.ts
index ad4ea129b..b0da19cce 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -199,17 +199,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="249"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="280"/>
<source>Connection timed out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="251"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="282"/>
<source>Unknown error: network reply was deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="403"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="434"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation type="unfinished"></translation>
</message>
@@ -945,34 +945,34 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="964"/>
+ <location filename="../src/gui/folder.cpp" line="970"/>
<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="967"/>
+ <location filename="../src/gui/folder.cpp" line="973"/>
<source>A folder from an external storage has been added.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="968"/>
+ <location filename="../src/gui/folder.cpp" line="974"/>
<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="1023"/>
+ <location filename="../src/gui/folder.cpp" line="1029"/>
<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="1026"/>
+ <location filename="../src/gui/folder.cpp" line="1032"/>
<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="1037"/>
+ <location filename="../src/gui/folder.cpp" line="1043"/>
<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).
@@ -981,7 +981,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="1082"/>
+ <location filename="../src/gui/folder.cpp" line="1088"/>
<source>All files in the sync folder &apos;%1&apos; 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.
@@ -989,46 +989,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="1087"/>
+ <location filename="../src/gui/folder.cpp" line="1093"/>
<source>All files got deleted from your local sync folder &apos;%1&apos;.
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="1091"/>
+ <location filename="../src/gui/folder.cpp" line="1097"/>
<source>Delete all files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1094"/>
+ <location filename="../src/gui/folder.cpp" line="1100"/>
<source>Delete all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1095"/>
+ <location filename="../src/gui/folder.cpp" line="1101"/>
<source>Restore deleted files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1112"/>
+ <location filename="../src/gui/folder.cpp" line="1118"/>
<source>This sync would reset the files to an earlier time in the sync folder &apos;%1&apos;.
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="1117"/>
+ <location filename="../src/gui/folder.cpp" line="1123"/>
<source>Backup detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1120"/>
+ <location filename="../src/gui/folder.cpp" line="1126"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"></translation>
</message>
@@ -1935,13 +1935,13 @@ for additional privileges during the process.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
- <source>%1 version %2 available. Restart application to start the update.</source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
+ <source>New %1 version %2 is available. Please click &lt;a href=&apos;%3&apos;&gt;here&lt;/a&gt; to download the update.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
- <source>New %1 version %2 available. Please use the system&apos;s update tool to install it.</source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
<translation type="unfinished"></translation>
</message>
<message>