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:
authorJenkins for ownCloud <owncloud-bot@tmit.eu>2017-10-25 03:21:52 +0300
committerJenkins for ownCloud <owncloud-bot@tmit.eu>2017-10-25 03:21:52 +0300
commit15af5878b61b73200c306d07aa78a044ca997db7 (patch)
tree93a249c9e5b96b2b5ca4b48930dc70fafc028d5b /translations/client_en.ts
parentc36043a175b33fd957ff5c8b97f6eb58f8f3ab3a (diff)
[tx-robot] updated from transifex
Diffstat (limited to 'translations/client_en.ts')
-rw-r--r--translations/client_en.ts84
1 files changed, 42 insertions, 42 deletions
diff --git a/translations/client_en.ts b/translations/client_en.ts
index 0f01e5bd1..1fef5facb 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -773,24 +773,24 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="883"/>
+ <location filename="../src/gui/folder.cpp" line="888"/>
<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="886"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>A folder from an external storage has been added.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="887"/>
+ <location filename="../src/gui/folder.cpp" line="892"/>
<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="922"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<source>All files in the sync folder &apos;%1&apos; folder 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 keep the files, they will be re-synced with the server if you have rights to do so.
@@ -798,46 +798,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="927"/>
+ <location filename="../src/gui/folder.cpp" line="932"/>
<source>All the files in your local sync folder &apos;%1&apos; were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="931"/>
+ <location filename="../src/gui/folder.cpp" line="936"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="934"/>
+ <location filename="../src/gui/folder.cpp" line="939"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="935"/>
+ <location filename="../src/gui/folder.cpp" line="940"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="952"/>
+ <location filename="../src/gui/folder.cpp" line="957"/>
<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="957"/>
+ <location filename="../src/gui/folder.cpp" line="962"/>
<source>Backup detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="960"/>
+ <location filename="../src/gui/folder.cpp" line="965"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="961"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"></translation>
</message>
@@ -1938,144 +1938,144 @@ It is not advisable to use it.</source>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="230"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/>
<source>&lt;font color=&quot;green&quot;&gt;Successfully connected to %1: %2 version %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="264"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="298"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="314"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="334"/>
<source>Trying to connect to %1 at %2...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="385"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="382"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="262"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="278"/>
<source>Invalid URL</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="427"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="452"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>Creating local sync folder %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="434"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="459"/>
<source>ok</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/>
<source>failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="463"/>
<source>Could not create local folder %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/>
<source>No remote folder specified!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="470"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/>
<source>Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="483"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/>
<source>creating folder on ownCloud: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/>
<source>Remote folder %1 created successfully.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="501"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="505"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="507"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="511"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="517"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="539"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
<source>Successfully connected to %1!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/>
<source>Folder rename failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="561"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="606"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="631"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation type="unfinished"></translation>
</message>