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

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'translations/client_en_GB.ts')
-rw-r--r--translations/client_en_GB.ts24
1 files changed, 12 insertions, 12 deletions
diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts
index f24b288e4..dacde9cab 100644
--- a/translations/client_en_GB.ts
+++ b/translations/client_en_GB.ts
@@ -205,17 +205,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/>
<source>Connection timed out</source>
<translation>Connection timed out</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="299"/>
<source>Unknown error: network reply was deleted</source>
<translation>Unknown error: network reply was deleted</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="421"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</translation>
</message>
@@ -2915,33 +2915,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="118"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="133"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="225"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
<source>File Removed</source>
<translation>File Removed</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="255"/>
<source>Local file changed during sync. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="561"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="576"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="564"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="579"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="460"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="144"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="475"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>Upload of %1 exceeds the quota for the folder</translation>
</message>
@@ -2992,12 +2992,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/>
+ <location filename="../src/libsync/propagateuploadtus.cpp" line="212"/>
<source>The local file was removed during sync.</source>
<translation>The local file was removed during sync.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/>
+ <location filename="../src/libsync/propagateuploadtus.cpp" line="223"/>
<source>Local file changed during sync.</source>
<translation>Local file changed during sync.</translation>
</message>