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:
authorownClouders <devops@owncloud.com>2019-08-26 21:33:52 +0300
committerDominik Schmidt <domme@tomahawk-player.org>2019-08-27 10:43:51 +0300
commit7cab48332f267ea42a1bcfaeed74f681e2921563 (patch)
tree7958f67a4e644afc3d9c7c656ec76ba698b989de /translations
parent6c162ff502d1a2da76f053e144e7a2767585751f (diff)
[tx] updated client translations from transifex
Diffstat (limited to 'translations')
-rw-r--r--translations/client_cs.ts162
-rw-r--r--translations/client_de.ts176
-rw-r--r--translations/client_el.ts176
-rw-r--r--translations/client_en.ts160
-rw-r--r--translations/client_es.ts176
-rw-r--r--translations/client_fa.ts160
-rw-r--r--translations/client_fr.ts164
-rw-r--r--translations/client_gl.ts176
-rw-r--r--translations/client_it.ts164
-rw-r--r--translations/client_ja.ts160
-rw-r--r--translations/client_nb_NO.ts164
-rw-r--r--translations/client_nl.ts160
-rw-r--r--translations/client_pl.ts162
-rw-r--r--translations/client_pt.ts162
-rw-r--r--translations/client_pt_BR.ts174
-rw-r--r--translations/client_ru.ts176
-rw-r--r--translations/client_sl.ts160
-rw-r--r--translations/client_sv.ts160
-rw-r--r--translations/client_th.ts174
-rw-r--r--translations/client_tr.ts164
-rw-r--r--translations/client_zh_CN.ts172
21 files changed, 2157 insertions, 1345 deletions
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index 637e1b350..b66a857f1 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -239,6 +239,21 @@
<translation>Odstranit připojení synchronizace adresáře</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>Vytvoření adresáře selhalo</translation>
@@ -409,11 +424,6 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Opravdu chcete zastavit synchronizaci adresáře &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Poznámka:&lt;/b&gt; Toto &lt;b&gt;neodstraní&lt;/b&gt; žádné soubory.&lt;/p&gt;</translation>
@@ -1237,12 +1247,12 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>Přidat synchronizaci adresáře</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>Přidat synchronizační připojení</translation>
</message>
@@ -1317,7 +1327,17 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1727,12 +1747,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Soubor &apos;%1&apos;&lt;br/&gt;nelze otevřít pro zápis.&lt;br/&gt;&lt;br/&gt;Výstup záznamu &lt;b&gt;nelze&lt;/b&gt; uložit.&lt;/nobr&gt;</translation>
</message>
@@ -1740,53 +1760,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>Je dostupná nová verze</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Je k dispozici nová verze klienta %1.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; je k dispozici ke stažení. Momentálně je nainstalována verze %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>Přeskoč tuto verzi</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>Tentokrát přeskočit</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>Získat aktualizaci</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation type="unfinished"/>
</message>
@@ -2040,28 +2060,43 @@ můžete být požádáni o dodatečná oprávnění.</translation>
<translation>Připojit...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>%1 adresář &apos;%2&apos; je synchronizován do místního adresáře &apos;%3&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>Synchronizovat adresář &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Varování:&lt;/strong&gt; Místní adresář není prázdný. Zvolte další postup!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>Místní synchronizovaný adresář</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2334,23 +2369,38 @@ Nedoporučuje se jí používat.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
- <translation>Povolit experimentální fukce?</translation>
+ <source>Enable technical preview feature?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
-
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-Switching to this mode will abort any currently running synchronization.
-
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation>Povolit experimentální fukce?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2361,12 +2411,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation>Povolit experimentální mód</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation type="unfinished"/>
</message>
@@ -2567,53 +2612,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>Volné místo na disku je méně než %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>Soubor byl smazán ze serveru</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>Soubor nemohl být kompletně stažen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>Stažený soubor je prázdný, přestože server oznámil, že měl být %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Soubor %1 nemohl být uložen z důvodu kolize názvu se souborem v místním systému!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>Soubor se mezitím změnil</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>Chyba zápisu metadat do databáze</translation>
</message>
@@ -3800,17 +3845,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>Hlavička kontrolního součtu je poškozena.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Hlavička kontrolního součtu obsahovala neznámý typ součtu &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Stažený soubor neodpovídá kontrolnímu součtu, bude znovu stažen.</translation>
</message>
@@ -4181,11 +4226,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>Stavová zpráva</translation>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index dcffe26ea..a518b992f 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -239,6 +239,21 @@
<translation>Ordner-Synchronisation entfernen</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>Anlegen des Ordners fehlgeschlagen</translation>
@@ -413,11 +428,6 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation>
<translation>Deaktiviere Unterstützung für virtuelle Dateien ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation>Unterstützung für virtuelle Dateien einschalten (experimentell) ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Möchten Sie den Ordner &lt;i&gt;%1&lt;/i&gt; wirklich nicht mehr synchronisieren?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anmerkung:&lt;/b&gt; Dies wird &lt;b&gt;keine&lt;/b&gt; Dateien löschen.&lt;/p&gt;</translation>
@@ -1247,12 +1257,12 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>Ordner-Synchronisation hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>Synchronisation hinzufügen</translation>
</message>
@@ -1327,8 +1337,18 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
- <translation>Virtuelle Dateien verwenden anstatt die Dateien herunter zu laden (experimental)</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1583,7 +1603,9 @@ Beachten Sie, das dies nur bestimmt von welchem Bereich Sie Upgrades erhalten un
<source>Files or folders matching a pattern will not be synchronized. Changes take effect the next time folders are synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation type="unfinished"/>
+ <translation>Dateien oder Ordner, die diesem Muster entsprechen, werden nicht synchronisiert. Änderungen werden bei der nächsten Synchronisation übernommen.
+
+Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn sie die Löschung eines Ordners verhindern würden. Das ist für Metadaten nützlich.</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="125"/>
@@ -1741,12 +1763,12 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Datei »%1«&lt;br/&gt;kann nicht zum Schreiben geöffnet werden.&lt;br/&gt;&lt;br/&gt;Die Protokolldatei kann &lt;b&gt;nicht&lt;/b&gt; gespeichert werden!&lt;/nobr&gt;</translation>
</message>
@@ -1754,53 +1776,53 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>Eine neue Version ist verfügbar.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
- <translation>&lt;p&gt;Eine neue Version des %1 - Klients ist verfügbar.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; steht zum Herunterladen bereit. Die installierte Version ist %3.&lt;/p&gt;</translation>
+ <translation>&lt;p&gt;Eine neue Version des %1 Clients ist verfügbar.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; steht zum Herunterladen bereit. Die installierte Version ist %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>Diese Version auslassen</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>Dieses Mal überspringen</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>Update durchführen</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation>Update fehlgeschlagen</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Eine neue Version des %1 Clients ist verfügbar, aber der Aktualisierungs-Prozess ist fehlgeschlagen.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; wurde heruntergeladen. Die installierte Version ist %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation>Später noch einmal fragen</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation>Neustarten und aktualisieren</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation>Manuell aktualisieren</translation>
</message>
@@ -2053,28 +2075,43 @@ for additional privileges during the process.</source>
<translation>Verbinden…</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>%1 Ordner &apos;%2&apos; wird mit dem lokalen Ordner &apos;%3&apos; synchronisiert</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>Ordner &apos;%1&apos; synchronisieren</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Achtung:&lt;/strong&gt; Der lokale Ordner ist nicht leer. Bitte wählen Sie eine entsprechende Lösung!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>Lokaler Ordner für die Synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2347,27 +2384,38 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
- <translation>Experimentelle Funktion aktivieren?</translation>
+ <source>Enable technical preview feature?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
-
-Switching to this mode will abort any currently running synchronization.
-
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
- <translation>Wenn der Modus &quot;Virtuelle Dateien&quot; aktiviert ist, werden die Dateien nicht sofort heruntergeladen. Stattdessen wird für jede Datei des Servers eine Platzhalter-Datei erstellt. Der Inhalt der Dateien wird beim Ausführen der Datei automatisch heruntergeladen. Stattdessen können Dateien auch händisch über das Kontext-Menü heruntergeladen werden.
-
-Der Modus virtuelle Dateien schließt sich mit dem Modus &quot;Selective Sync&quot; gegenseitig aus. Aktuell abgewählte Ordner werden zu nur online verfügbaren Ordnern umgesetzt und die Einstellungen im &quot;Selective Sync&quot; werden verworfen.
-
-Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, berichten sie bitte alle Probleme, die auftreten.</translation>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation>Experimentelle Funktion aktivieren?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2382,12 +2430,7 @@ Der Modus virtuelle Dateien schließt sich mit dem Modus &quot;Selective Sync&qu
Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, berichten sie bitte alle Probleme, die auftreten.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation>Experimentellen Modus aktivieren</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation>Sicher bleiben</translation>
</message>
@@ -2588,53 +2631,53 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht herunter geladen werden!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Das Herunterladen würde den lokalen freien Speicherplatz unter das Limit reduzieren</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>Der freie Speicher auf der Festplatte ist weniger als %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation>Herunterladen eines Teils beendet, aber es kam keine Antwort!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>Die Datei wurde vom Server gelöscht</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>Die Datei konnte nicht vollständig herunter geladen werden.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>Die heruntergeladene Datei ist leer, obwohl der Server %1 als Größe übermittelt hat.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gespeichert geladen werden!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>Datei ist seit der Entdeckung geändert worden</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
</message>
@@ -3823,17 +3866,17 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>Der Prüfsummen-Header hat ein fehlerhaftes Format.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Die Prüfsummen-Kopfzeile enthielt den unbekannten Prüfsummentypen &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Die heruntergeladene Datei entspricht nicht der Prüfsumme, das Herunterladen wird wiederaufgenommen.</translation>
</message>
@@ -4204,11 +4247,6 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<translation>Alle Daten vom Server s&amp;ynchronisieren (empfohlen)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation>Virtuelle Dateien verwenden anstatt die Dateien herunter zu laden (e&amp;xperimental)</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>Statusnachricht</translation>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index b84e00dd8..e5f314993 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -239,6 +239,21 @@
<translation>Αφαίρεση σύνδεσης συγχρονισμού φακέλου</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>Αποτυχία αφαίρεσης φακέλου</translation>
@@ -413,11 +428,6 @@ This action will abort any currently running synchronization.</source>
<translation>Απενεργοποίηση υποστήριξης εικονικού αρχείου...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation>Ενεργοποίησης υποστήριξης εικονικού αρχείου (πειραματικό στάδιο)...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Θέλετε πραγματικά να σταματήσετε το συγχρονισμό του φακέλου &lt;i&gt;%1&lt;/i&gt;;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Σημείωση:&lt;/b&gt; Αυτό &lt;b&gt;δεν&lt;/b&gt; θα διαγράψει κανένα αρχείο.&lt;/p&gt;</translation>
@@ -1247,12 +1257,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>Προσθήκη Σύνδεσης Συγχρονισμού Φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>Προσθήκη Σύνδεσης Συγχρονισμού</translation>
</message>
@@ -1327,8 +1337,18 @@ If this was an accident and you decide to keep your files, they will be re-synce
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
- <translation>Χρησιμοποιήστε εικονικά αρχεία αντί για άμεση λήψη περιεχομένου (πειραματικά)</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1584,7 +1604,9 @@ Note that this selects only what pool upgrades are taken from, and that there ar
<source>Files or folders matching a pattern will not be synchronized. Changes take effect the next time folders are synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation type="unfinished"/>
+ <translation>Τα αρχεία ή οι φάκελοι που ταιριάζουν με ένα μοτίβο δεν θα συγχρονιστούν. Οι αλλαγές αρχίζουν να ισχύουν την επόμενη φορά που θα συγχρονίζονται οι φάκελοι.
+
+Τα στοιχεία όπου επιτρέπεται η διαγραφή θα διαγραφούν αν αποτρέψουν την αφαίρεση ενός καταλόγου. Αυτό είναι χρήσιμο για μεταδεδομένα.</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="125"/>
@@ -1742,12 +1764,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>Σφάλμα</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Το αρχείο &apos;%1&apos;&lt;br/&gt;δεν μπορεί να ανοιχθεί για εγγραφή.&lt;br/&gt;&lt;br/&gt;Το αρχείο καταγραφής &lt;b&gt;δεν&lt;/b&gt; μπορεί να αποθηκευτεί!&lt;/nobr&gt; </translation>
</message>
@@ -1755,53 +1777,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>Νέα Έκδοση Διαθέσιμη </translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Μια νέα έκδοση του %1 Δέκτη είναι διαθέσιμη.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; είναι διαθέσιμη για λήψη. Η εγκατεστημένη έκδοση είναι %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>Παράλειψη αυτής της έκδοσης</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>Παράλειψη αυτή τη φορά</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>Λήψη ενημέρωσης</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation>Απέτυχε η ενημέρωση</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Μια νέα έκδοση του πελάτη %1 είναι διαθέσιμη αλλά η διαδικασία ενημέρωσης απέτυχε.&lt;/p&gt;&lt;p&gt;Το &lt;b&gt;%2&lt;/b&gt; έχει ληφθεί. Η εγκατεστημένη έκδοση είναι %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation>Να γίνει ερώτηση ξανά αργότερα</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation>Επανεκκίνηση και ενημέρωση</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation>Χειροκίνητη ενημέρωση</translation>
</message>
@@ -2055,28 +2077,43 @@ for additional privileges during the process.</source>
<translation>Σύνδεση...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>Ο %1 φάκελος &apos;%2&apos; είναι συγχρονισμένος με τον τοπικό φάκελο &apos;%3&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>Συγχρονισμός φακέλου &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Προσοχή:&lt;/strong&gt; Ο τοπικός φάκελος δεν είναι άδειος. Επιλέξτε μια επίλυση!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>Τοπικός Φάκελος Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2349,29 +2386,38 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
- <translation>Ενεργοποίηση πειραματικής λειτουργίας;</translation>
+ <source>Enable technical preview feature?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
-
-Switching to this mode will abort any currently running synchronization.
-
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
- <translation>Όταν είναι ενεργοποιημένη η λειτουργία &quot;εικονικά αρχεία&quot; δεν θα ληφθούν αρχικά αρχεία. Αντί για αυτό θα δημιουργηθεί ένα αρχείο σύστασης για κάθε αρχείο που υπάρχει στον διακομιστή. Όταν ανοίξει ένα αρχείο, το περιεχόμενό του θα φορτωθεί αυτόματα. Εναλλακτικά, τα αρχεία μπορούν να μεταφορτωθούν με μη αυτόματο τρόπο χρησιμοποιώντας το μενού περιβάλλοντος.
-
-Η λειτουργία εικονικών αρχείων είναι αμοιβαία αποκλειστική με επιλεκτικό συγχρονισμό. Οι φάκελοι που δεν έχουν επιλεγεί προς το παρόν θα μεταφραστούν σε φακέλους μόνο σε σύνδεση και οι επιλεγμένες ρυθμίσεις συγχρονισμού θα επαναρυθμιστούν.
-
-Εάν μεταβείτε σε αυτήν τη λειτουργία, θα ακυρωθεί οποιοσδήποτε τρέχων συγχρονισμός.
-
-Πρόκειται για μια νέα, πειραματική λειτουργία. Αν αποφασίσετε να τη χρησιμοποιήσετε, αναφέρετε τυχόν ζητήματα που προκύπτουν.</translation>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation>Ενεργοποίηση πειραματικής λειτουργίας;</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2388,12 +2434,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
Πρόκειται για μια νέα, πειραματική λειτουργία. Αν αποφασίσετε να την χρησιμοποιήσετε, αναφέρετε τυχόν ζητήματα που προκύπτουν.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation>Ενεργοποίηση πειραματικής κατάστασης</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation>Μείνετε ασφαλείς</translation>
</message>
@@ -2594,53 +2635,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Η λήψη θα μειώσει τον ελεύθερο χώρο τοπικού δίσκου κάτω από το όριο</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>Ο διαθέσιμος χώρος στο δίσκο είναι λιγότερος από %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation>Ολοκληρώθηκε η υποδοχή λήψης, αλλά δεν υπήρξε απάντηση!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>Το αρχείο διαγράφηκε από τον διακομιστή</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>Η λήψη του αρχείου δεν ολοκληρώθηκε.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>Το ληφθέν αρχείο είναι άδειο, παρόλο που ο διακομιστής ανακοίνωσε ότι θα έπρεπε να ήταν% 1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
</message>
@@ -3829,17 +3870,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>Η κεφαλίδα του αθροίσματος ελέγχου δεν είναι σωστά διαμορφωμένη.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Το checksum header περιέχει άγνωστο τύπο checksum &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Το αρχείο που μεταφορτώθηκε δεν επαληθεύει το άθροισμα ελέγχου, θα συγχρονιστεί πάλι.</translation>
</message>
@@ -4210,11 +4251,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Να γίνει σ&amp;υγρονισμός όλων από τον διακομιστή (συνίσταται)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation>Να γίνει χρήση εικονικών αρχεία αντί για άμεση λήψη περιεχομένου (π&amp;ειραματικά)</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>Μήνυμα κατάστασης</translation>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index 52ca1557b..26e183380 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -241,6 +241,21 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation type="unfinished"></translation>
@@ -411,11 +426,6 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
@@ -1264,12 +1274,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation type="unfinished"></translation>
</message>
@@ -1344,7 +1354,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1754,12 +1774,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -1767,53 +1787,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation type="unfinished"></translation>
</message>
@@ -2066,28 +2086,43 @@ for additional privileges during the process.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
- <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation type="unfinished"></translation>
</message>
@@ -2359,23 +2394,38 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
+ <source>Enable technical preview feature?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
-
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
-
-Switching to this mode will abort any currently running synchronization.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2386,12 +2436,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation type="unfinished"></translation>
</message>
@@ -2592,53 +2637,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"></translation>
</message>
@@ -3823,17 +3868,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"></translation>
</message>
@@ -4204,11 +4249,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation type="unfinished"></translation>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index 3b053be9b..a9d30702e 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -239,6 +239,21 @@
<translation>Eliminar la sincronización de carpetas conectadas</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>Hubo un fallo al crear la carpeta</translation>
@@ -413,11 +428,6 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra
<translation>Deshabilitar el soporte de archivos virtuales...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation>Activar soporte a archivo virtual (experimental)...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿De verdad quiere dejar de sincronizar la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; elminará los archivo.&lt;/p&gt;</translation>
@@ -1247,12 +1257,12 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>Añadir Conexión para el Directorio de Sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>Añadir Sincronización de Conexión</translation>
</message>
@@ -1327,8 +1337,18 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
- <translation>Usar archivos virtuales, en lugar de descargarse el contenido inmediatamente (experimental)</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1584,7 +1604,9 @@ Nota: esto solo selecciona el canal deseado y no permite vueltas atras. Por lo q
<source>Files or folders matching a pattern will not be synchronized. Changes take effect the next time folders are synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation type="unfinished"/>
+ <translation>Los archivos o carpetas que coincidan con un patrón no se sincronizarán. Los cambios tienen efecto la siguiente vez que se sincronizan las carpetas.
+
+Los objetos donde se permite el borrado serán borrados si impiden que un directorio sea eliminado. Esto es útil para los metadatos.</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="125"/>
@@ -1742,12 +1764,12 @@ Tenga en cuenta que el uso de cualquier opción de línea de comando de registro
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;El archivo &apos;%1&apos;&lt;br/&gt;no se puede abrir para escritura.&lt;br/&gt;&lt;br/&gt;¡El archivo de registro &lt;b&gt;no&lt;/b&gt; se puede guardar!&lt;/nobr&gt;</translation>
</message>
@@ -1755,53 +1777,53 @@ Tenga en cuenta que el uso de cualquier opción de línea de comando de registro
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>Nueva versión disponible</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Una nueva versión del programa cliente de %1 está disponible.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; está disponible para descargar. La versión instalada es la %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>Saltarse esta versión</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>Omitir esta vez</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>Actualizar</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation>Actualización falló</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Una nueva versión de %1 Client está disponible pero el proceso de actualización falló.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; ha sido descargado. La versión instalada es %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation>Preguntar de nuevo más tarde </translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation>Reiniciar y actualizar</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation>Actualizar manualmente</translation>
</message>
@@ -2054,28 +2076,43 @@ for additional privileges during the process.</source>
<translation>Conectar...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>La carpeta %1 &apos;%2&apos; está sincronizada con la carpeta local &apos;%3&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>Sincronizar el directorio &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Advertencia:&lt;/strong&gt; El directorio local no está vacío. ¡Seleccione una resolución!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>Carpeta local de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2348,29 +2385,38 @@ No se recomienda usarla.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
- <translation>¿Activar característica experimental?</translation>
+ <source>Enable technical preview feature?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
-
-Switching to this mode will abort any currently running synchronization.
-
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
- <translation>Cuando el modo &quot;archivos virtuales&quot; está habilitado, inicialmente no se descargarán archivos. En su lugar, se creará un archivo de marcador de posición para cada archivo que exista en el servidor. Cuando se abra un archivo, su contenido se descargará automáticamente. Alternativamente, los archivos se pueden descargar manualmente utilizando su menú contextual.
-
-El modo de archivos virtuales se excluye mutuamente con sincronización selectiva. Las carpetas actualmente no seleccionadas se traducirán a carpetas solo en línea y se restablecerán sus configuraciones de sincronización selectiva.
-
-Cambiar a este modo abortará cualquier sincronización actualmente en ejecución.
-
-Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier problema que surja.</translation>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation>¿Activar característica experimental?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2387,12 +2433,7 @@ Cambiar a este modo abortará cualquier sincronización actualmente en ejecució
Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier problema que surja.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation>Activar modo experimental</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation>Permanecer seguro</translation>
</message>
@@ -2593,53 +2634,53 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>¡El archivo %1 no se puede descargar a causa de un conflicto con el nombre de un archivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>La descarga reducirá el espacio libre local por debajo del límite.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>El espacio libre en el disco es inferior a %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation>La ranura de descarga terminó, pero no hubo respuesta!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>Se ha eliminado el archivo del servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>No se ha podido descargar el archivo completamente.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>El archivo descargado está vacio aunque el servidor dice que deberia haber sido %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>¡El archivo %1 no puede guardarse debido a un conflicto con el nombre de otro archivo local!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>El archivo ha cambiado desde que fue descubierto</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos en la base de datos</translation>
</message>
@@ -3828,17 +3869,17 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>La cabecera del archivo de comprobación es incorrecto.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>La suma de comprobación de cabeceras contenía una suma de comprobación desconocida de tipo &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>El archivo descargado no coincide con el archivo de comprobación, será reanudado.</translation>
</message>
@@ -4209,11 +4250,6 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<translation>Sincronizar todo desde el servidor (recomendado)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation>Usar archivos virtuales, en lugar de descargarse el contenido inmediatamente (e&amp;xperimental)</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>Mensaje de estado</translation>
diff --git a/translations/client_fa.ts b/translations/client_fa.ts
index c4e4aafaf..5dfa76374 100644
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -239,6 +239,21 @@
<translation>حذف اتصال همگام سازی پوشه </translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>ساخت پوشه ناموفق</translation>
@@ -409,11 +424,6 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;آیا شما واقعا می خواهید همگام سازی پوشه &lt;i&gt;1%&lt;/i&gt; را متوقف نمایید؟&lt;/p&gt;&lt;p&gt;&lt;b&gt;توجه:&lt;/b&gt;این هیچ فایلی را حذف &lt;b&gt;نخواهد&lt;/b&gt; کرد. &lt;/p&gt;</translation>
@@ -1239,12 +1249,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>اضافه کردن اتصال همگام سازی پوشه</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>افزودن اتصال همگام سازی</translation>
</message>
@@ -1319,7 +1329,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1729,12 +1749,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>خطا</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;پرونده &apos;1%&apos; &lt;br/&gt; را نمی توان برای نوشتن باز کرد. &lt;br/&gt;&lt;br/&gt;خروجی log &lt;b&gt;نمی تواند&lt;/b&gt; ذخیره شود!&lt;/nobr&gt;</translation>
</message>
@@ -1742,53 +1762,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>نسخه جدید در دسترس است</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;یک نسخه جدید از مشتری 1% در دسترس است.&lt;/p&gt; &lt;p&gt;&lt;b&gt;2% &lt;/b&gt; برای دانلود در دسترس است. نسخه نصب شده 3% است. &lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>نادیده گرفتن این نسخه</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>نادیده گرفتن این زمان</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>به دست آوردن به روز رسانی</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation type="unfinished"/>
</message>
@@ -2041,28 +2061,43 @@ for additional privileges during the process.</source>
<translation>اتصال...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>%1 پوشه &apos;%2&apos; با پوشه محلی همگام شده است &apos;%3&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>همگام‌سازی پوشه‌ی &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;هشدار:&lt;/strong&gt; پوشه محلی خالی نیست. یک دقت انتخاب کنید!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>پوشه همگام سازی محلی</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2335,23 +2370,38 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
+ <source>Enable technical preview feature?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
-
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
-
-Switching to this mode will abort any currently running synchronization.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2362,12 +2412,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation type="unfinished"/>
</message>
@@ -2568,53 +2613,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>پرونده 1% بخاطر یک پرونده محلی به نام برخورد دانلود نمی شود!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>دانلود فضای دیسک محلی آزاد تحت محدودیت را کاهش می دهد</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>فضای خالی دیسک کمتر از %1 است</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>فایل از روی سرور حذف شد</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>فایل به طور کامل قابل دانلود نیست.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>پرونده دانلود شده خالی است با وجود اینکه سرور اعلام کرده است این باید 1% باشد.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>پرونده 1% بخاطر یک پرونده محلی به نام برخورد ذخیره نمی شود!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>پرونده از زمان کشف تغییر کرده است.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>خطا در نوشتن متادیتا در پایگاه داده</translation>
</message>
@@ -3800,17 +3845,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>سرتیتر checksum نادرست است.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>سرتیتر checksum شامل یک checksum نوع &apos;1%&apos; ناشناخته است</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>پرونده دانلود شده با checksum مطابق نیست، این ادامه خواهد یافت.</translation>
</message>
@@ -4181,11 +4226,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>پیغام وضعیت</translation>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index 464a5095c..281fa4893 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -239,6 +239,21 @@
<translation>Supprimer la synchronisation du dossier</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>Échec de création du dossier</translation>
@@ -409,11 +424,6 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Voulez-vous vraiment arrêter de synchroniser le dossier &lt;i&gt;%1&lt;/i&gt; ?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note :&lt;/b&gt; Aucun fichier ne sera supprimé.&lt;/p&gt;</translation>
@@ -1244,12 +1254,12 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>Ajouter une synchronisation de dossier</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>Ajouter une Synchronisation</translation>
</message>
@@ -1324,8 +1334,18 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
- <translation>Utiliser des fichiers virtuels au lieu de télécharger le contenu immédiatement (expérimental)</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1736,12 +1756,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Le fichier &apos;%1&apos;&lt;br/&gt;ne peut être ouvert en écriture.&lt;br/&gt;&lt;br/&gt;Le fichier de journalisation &lt;b&gt;ne peut pas&lt;/b&gt; être enregistré !&lt;/nobr&gt;</translation>
</message>
@@ -1749,53 +1769,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>Nouvelle version disponible</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Une nouvelle version du client %1 est disponible.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; est disponible au téléchargement. La version actuellement installée est %3.&lt;p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>Ignorer cette version</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>Ignorer pour cette fois</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>Télécharger la version</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation type="unfinished"/>
</message>
@@ -2049,28 +2069,43 @@ L&apos;assistant de mise à jour peut vous demandez des autorisations supplémen
<translation>Connexion…</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>le dossier %1 &apos;%2&apos; est synchronisé avec le dossier local &apos;%3&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>Synchroniser le dossier &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Attention :&lt;/strong&gt; Le dossier local n&apos;est pas vide. Que voulez-vous faire ?&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>Dossier de synchronisation local</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2343,23 +2378,38 @@ Il est déconseillé de l&apos;utiliser.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
- <translation>Activer les fonctionnalités expérimentales ?</translation>
+ <source>Enable technical preview feature?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
-
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-Switching to this mode will abort any currently running synchronization.
-
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation>Activer les fonctionnalités expérimentales ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2370,12 +2420,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation>Activer le mode expérimental</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation>Rester sauf</translation>
</message>
@@ -2576,53 +2621,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Le fichier %1 ne peut pas être téléchargé en raison d&apos;un conflit sur le nom de fichier local. </translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Le téléchargement réduira l&apos;espace disque libre en dessous de la limite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>Il y a moins de %1 d&apos;espace libre sur le disque</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>Le fichier a été supprimé du serveur</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>Le fichier n&apos;a pas pu être téléchargé intégralement.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>Le fichier téléchargé est vide bien que le serveur indique que sa taille devrait être de %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Le fichier %1 n&apos;a pas pu être sauvegardé en raison d&apos;un conflit sur le nom du fichier local !</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>Le fichier a changé depuis sa découverte</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>Erreur à l&apos;écriture des métadonnées dans la base de données</translation>
</message>
@@ -3810,17 +3855,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>L&apos;entête de somme de contrôle est mal formée.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>L&apos;en-tête de la somme de contrôle contenait un type de somme de contrôle inconnu &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Le fichier téléchargé ne correspond pas à la somme de contrôle, il va être téléchargé à nouveau.</translation>
</message>
@@ -4191,11 +4236,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>Message d&apos;état</translation>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index 81463fc79..f1dbd8bb7 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -239,6 +239,21 @@
<translation>Retirar a conexión da sincronización do cartafol</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>Non foi posíbel crear o cartafol</translation>
@@ -413,11 +428,6 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.<
<translation>Desactivar a compatibilidade con ficheiro virtual…</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation>Activar a compatibilidade con ficheiro virtual (experimental)…</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Quere realmente deixar de sincronizar o cartafol &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Aviso:&lt;/b&gt; Isto &lt;b&gt;non&lt;/b&gt; eliminará ningún ficheiro.&lt;/p&gt;</translation>
@@ -1248,12 +1258,12 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>Engadir a conexión da sincronización do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>Engadir a conexión da sincronización</translation>
</message>
@@ -1328,8 +1338,18 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
- <translation>Usar ficheiros virtuais, no canto de descargar o contido inmediatamente (experimental)</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1585,7 +1605,9 @@ Teña en conta que isto só selecciona a canle desexada e que non hai reversión
<source>Files or folders matching a pattern will not be synchronized. Changes take effect the next time folders are synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation type="unfinished"/>
+ <translation>Os ficheiros ou cartafoles que coincidan cun patrón non se sincronizarán.Os cambios terán efecto en vigor a próxima vez que se sincronicenn os cartafoles.
+
+Os elementos onde se permite a eliminación eliminaranse se impiden que se elimine un directorio. Isto é útil para os metadatos.</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="125"/>
@@ -1743,12 +1765,12 @@ Teña en conta que o uso de calquera opción de rexistro por liña de ordes anul
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;O ficheiro «%1»&lt;br/&gt; non se pode abrir para escritura.&lt;br/&gt;&lt;br/&gt;A saída do rexistro &lt;b&gt;non&lt;/n&gt; se pode gardar!&lt;/nobr&gt;</translation>
</message>
@@ -1756,53 +1778,53 @@ Teña en conta que o uso de calquera opción de rexistro por liña de ordes anul
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>Hai dispoñíbel unha nova versión</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Hai dispoñíbel unha nova versión do cliente %1.&lt;/p&gt;&lt;p&gt;Pode descargar a versión &lt;b&gt;%2&lt;/b&gt;. A versión instalada é a %3&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>Omitir esta versión</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>Omitir polo de agora</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>Obter a actualización</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation>Produciuse un fallo na actualización</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Está dispoñible unha nova versión do cliente %1 pero fallou o proceso de actualización.&lt;/p&gt;&lt;p&gt;Descargouse &lt;b&gt;%2&lt;/b&gt;. A versión instalada é %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation>Preguntar máis tarde</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation>Reiniciar e actualizar</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation>Actualizar manualmente</translation>
</message>
@@ -2056,28 +2078,43 @@ actualización pode pedir privilexios adicionais durante o procedemento.</transl
<translation>Conectar...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>O cartafol %1 «%2» está sincronizado co cartafol local «%3»</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>Sincronizar o cartafol «%1»</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Aviso:&lt;/strong&gt; O cartafol local non está baleiro. Escolla unha solución!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>Sincronización do cartafol local</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2350,29 +2387,38 @@ Recomendámoslle que non o use.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
- <translation>Activar a característica experimental?</translation>
+ <source>Enable technical preview feature?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
-
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
-
-Switching to this mode will abort any currently running synchronization.
-
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
- <translation>Cando estea activado o modo «ficheiros virtuais», non se descargará ningún ficheiro inicialmente. No canto diso, crearase un pequeno ficheiro de marcador de posición para cada ficheiro existente no servidor. Cando se abre un ficheiro descárgase automaticamente o contido. Alternativamente, os ficheiros pódense descargar manualmente empregando o menú contextual.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-O modo de ficheiros virtuais é mutuamente exclusivo coa sincronización selectiva. Os cartafoles non seleccionados actualmente serán traducidos aos cartafoles só en liña e axustarase a configuración de sincronización selectiva.
-
-Cambiar a este modo interromperá calquera sincronización en proceso.
-
-Este é un modo novo e experimental. Se decide usalo, informe de calquera problema que apareza.</translation>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation>Activar a característica experimental?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2389,12 +2435,7 @@ Cambiar a este modo interromperá calquera sincronización en proceso.
Este é un modo novo e experimental. Se decide usalo, informe de calquera problema que apareza.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation>Activar o modo experimental</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation>Permanecer seguro</translation>
</message>
@@ -2595,53 +2636,53 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Non é posíbel descargar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>A descarga reducirá o espazo libre local por baixo do límite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>O espazo libre no disco é inferior a %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation>A rañura de descarga rematou, mais non houbo resposta!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>O ficheiro vai ser eliminado do servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>Non foi posíbel descargar completamente o ficheiro.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>O ficheiro descargado está baleiro, aínda que o servidor dí que o seu tamaño debe ser de %1. </translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>O ficheiro cambiou após ser atopado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>Produciuse un erro ao escribir os metadatos na base de datos</translation>
</message>
@@ -3830,17 +3871,17 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>A cabeceira da suma de comprobación é incorrecta.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>A cabeceira da suma de comprobación contén un tipo de suma de comprobación descoñecido «%1»</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>O ficheiro descargado non coincide coa suma de comprobación. Retomase.</translation>
</message>
@@ -4211,11 +4252,6 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<translation>Sincroniza&amp;r todo dende o servidor (recomendado)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation>Usar ficheiros virtuais, no canto de descargar o contido inmediatamente (e&amp;xperimental)</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>Mensaxe de estado</translation>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index d5e47004e..0d43f7dae 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -239,6 +239,21 @@
<translation>Rimuovi connessione di sincronizzazione cartelle</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>Creazione della cartella non riuscita</translation>
@@ -409,11 +424,6 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vuoi davvero fermare la sincronizzazione della cartella &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; ciò &lt;b&gt;non&lt;/b&gt; eliminerà alcun file.&lt;/p&gt;</translation>
@@ -1244,12 +1254,12 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>Aggiungi connessioni di sincronizzazione cartelle</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>Aggiungi connessione di sincronizzazione</translation>
</message>
@@ -1324,8 +1334,18 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
- <translation>Usa file virtuali invece di scaricare il contenuto immediatamente (sperimentale)</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1736,12 +1756,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Il file &apos;%1&apos;&lt;br/&gt;non può essere aperto in scrittura.&lt;br/&gt;&lt;br/&gt;Il risultato del log &lt;b&gt;non&lt;/b&gt; può essere salvato!&lt;/nobr&gt;</translation>
</message>
@@ -1749,53 +1769,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>Nuova versione disponibile</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Una nuova versione del client %1 è disponibile.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; è disponibile per lo scaricamento. La versione installata è %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>Salta questa versione</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>Salta questa volta</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>Ottieni l&apos;aggiornamento</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation type="unfinished"/>
</message>
@@ -2048,28 +2068,43 @@ for additional privileges during the process.</source>
<translation>Connetti...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>La cartella &apos;%2&apos; di %1 è sincronizzata con la cartella locale &apos;%3&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>Sincronizza la cartella &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Avviso:&lt;/strong&gt; la cartella locale non è vuota. Scegli una soluzione.&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>Cartella locale di sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2342,23 +2377,38 @@ Non è consigliabile utilizzarlo.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
- <translation>Attivare la funzione sperimentale?</translation>
+ <source>Enable technical preview feature?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
-
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-Switching to this mode will abort any currently running synchronization.
-
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation>Attivare la funzione sperimentale?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2369,12 +2419,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation>Attiva modalità sperimentale</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation>Resta sicuro</translation>
</message>
@@ -2575,53 +2620,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Il file %1 non può essere scaricato a causa di un conflitto con un file locale.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Il download ridurrebbe lo spazio su disco al di sotto del limite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>Lo spazio libero su disco è inferiore a %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>Il file è stato eliminato dal server</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>Il file non può essere scaricato completamente.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>Il file scaricato è vuoto nonostante il server indicasse una dimensione di %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Il file %1 non può essere salvato a causa di un conflitto con un file locale.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>Il file è stato modificato dal suo rilevamento</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>Errore durante la scrittura dei metadati nel database</translation>
</message>
@@ -3808,17 +3853,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>L&apos;intestazione del codice di controllo non è valida.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>L&apos;intestazione di controllo conteneva un tipo di codice di controllo &apos;%1&apos; sconosciuto</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Il file scaricato non verifica il codice di controllo, sarà ripristinato.</translation>
</message>
@@ -4189,11 +4234,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>&amp;Sincronizza tutto dal server (consigliato)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation>Usa file virtuali invece di scaricare il contenuto immediatamente (s&amp;perimentale)</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>Messaggio di stato</translation>
diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index 61563b29c..2e8bac141 100644
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -239,6 +239,21 @@
<translation>同期フォルダー接続を削除</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>フォルダーの作成に失敗しました</translation>
@@ -409,11 +424,6 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;フォルダー&lt;i&gt;%1&lt;/i&gt;の同期を本当に止めますか?&lt;/p&gt;&lt;p&gt;&lt;b&gt;注:&lt;/b&gt; これによりファイルが一切削除されることはありません。&lt;/p&gt;</translation>
@@ -1239,12 +1249,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>同期フォルダーを追加</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>同期接続を追加</translation>
</message>
@@ -1319,7 +1329,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1729,12 +1749,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>エラー</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;ファイル &apos;%1&apos;&lt;br/&gt;を書き込み用で開けませんでした。&lt;br/&gt;&lt;br/&gt;ログ出力を&lt;b&gt;保存できません&lt;/b&gt;でした!&lt;/nobr&gt;</translation>
</message>
@@ -1742,53 +1762,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>新しいバージョンが利用可能です</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;%1 クライアントの新しいバージョンが利用可能です。&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; がダウンロード可能です。インストールされているバージョンは %3 です。&lt;p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>今回のバージョンをスキップ</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>今回はスキップ</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>アップデートを取得</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation type="unfinished"/>
</message>
@@ -2041,28 +2061,43 @@ for additional privileges during the process.</source>
<translation>接続...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>%1 フォルダー &apos;%2&apos; はローカルフォルダー &apos;%3&apos; と同期しています</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>&apos;%1&apos; フォルダーを同期</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;警告:&lt;/strong&gt; ローカルフォルダーは空ではありません。解決方法を選択してください!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>ローカル同期フォルダー</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2334,23 +2369,38 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
+ <source>Enable technical preview feature?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
-
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
-
-Switching to this mode will abort any currently running synchronization.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2361,12 +2411,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation type="unfinished"/>
</message>
@@ -2567,53 +2612,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>ファイル %1 はローカルファイル名が衝突しているためダウンロードできません!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>ディスク空き容量が %1 よりも少なくなっています</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>ファイルはサーバーから削除されました</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>このファイルのダウンロードは完了しませんでした</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>サーバーが通知しているファイルは %1 であるべきですが、ダウンロードファイルは空でした。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>%1 はローカルファイル名が衝突しているため保存できません!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>ファイルは発見以降に変更されました</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
@@ -3800,17 +3845,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>ヘッダーのチェックサムが異常です。</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>チェックサムヘッダーに &apos;%1&apos; という未知のチェックサムが含まれていました</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>ダウンロードしたファイルがチェックサムエラーです。再ダウンロードします。</translation>
</message>
@@ -4181,11 +4226,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>状態メッセージ</translation>
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts
index f37ff01b1..e16a131a1 100644
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -239,6 +239,21 @@
<translation>Fjern tilkobling for mappe-synkronisering</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>Oppretting av mappe feilet</translation>
@@ -409,11 +424,6 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vil du virkelig stoppe synkronisering av mappen &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Merk:&lt;/b&gt; Dette vil &lt;b&gt;ikke&lt;/b&gt; slette noen filer.&lt;/p&gt;</translation>
@@ -1238,12 +1248,12 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>Legg til mappe-synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>Legg til tilkobling for synkronisering</translation>
</message>
@@ -1318,8 +1328,18 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
- <translation>Bruk virtuelt filsystem istedet for å laste ned filer umiddelbart (eksperimentelt) </translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1731,12 +1751,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>Feil</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Fil &apos;%1&apos;&lt;br/&gt;kan ikke åpnes for skriving.&lt;br/&gt;&lt;br/&gt;Loggen kan &lt;b&gt;ikke&lt;/b&gt; lagres!&lt;/nobr&gt;</translation>
</message>
@@ -1744,53 +1764,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>Ny versjon tilgjengelig</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;En ny versjon av %1-klienten er tilgjengelig.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; er tilgjengelig for nedlasting. Installert versjon er %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>Hopp over denne versjonen</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>Hopp over denne gangen</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>Hent oppdatering</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation type="unfinished"/>
</message>
@@ -2044,28 +2064,43 @@ kan be om flere rettigheter underveis.</translation>
<translation>Koble til...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>%1 mappe &apos;%2&apos; er synkronisert til lokal mappe &apos;%3&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>Synkroniser mappen &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Advarsel:&lt;/strong&gt; Den lokale mappen er ikke tom. Velg en løsning!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>Lokal synkroniseringsmappe</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2338,23 +2373,38 @@ Det er ikke tilrådelig å bruke den.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
- <translation>Aktiver eksperimentelle funksjoner?</translation>
+ <source>Enable technical preview feature?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
-
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-Switching to this mode will abort any currently running synchronization.
-
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation>Aktiver eksperimentelle funksjoner?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2365,12 +2415,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation>Aktiver eksperimentelt modus</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation>Hold deg trygg</translation>
</message>
@@ -2571,53 +2616,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Fil %1 kan ikke lastes ned på grunn av lokalt sammenfall av filnavn!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Nedlastingen ville ha redusert ledig lokal diskplass under grensen</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>Ledig plass på disk er mindre enn %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>Filen ble slettet fra serveren</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>Hele filen kunne ikke lastes ned.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>Nedlastet fil er tom, selv om serveren annonserte at den skulle være %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Fil %1 kan ikke lagres på grunn av lokal konflikt med filnavn.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>Filen er endret siden den ble oppdaget</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>Feil ved skriving av metadata til databasen</translation>
</message>
@@ -3804,17 +3849,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>Sjekksum-headeren har feil format.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Sjekksum-header inneholdt ukjent sjekksum-type &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Den nedlastede filen passer ikke med sjekksummen, den vil bli gjenopptatt.</translation>
</message>
@@ -4185,11 +4230,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Synkroniser alt fra serveren (anbefalt)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>Statusmelding</translation>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index 827aa9ac3..540d4c0cb 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -239,6 +239,21 @@
<translation>Verwijder map-synchronisatie verbinding</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>Maken map mislukt</translation>
@@ -413,11 +428,6 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation>
<translation>Schakel virtuele bestanden ondersteuning uit...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation>Schakel virtuele bestanden ondersteuning int (experimenteel)...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Weet u zeker dat u de synchronisatie van map &lt;i&gt;%1&lt;/i&gt; wilt stoppen?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Opmerking:&lt;/b&gt; Dit zal &lt;b&gt;geen&lt;/b&gt; bestanden verwijderen.&lt;/p&gt;</translation>
@@ -1243,12 +1253,12 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>Voeg map-synchronisatie verbinding toe</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>Toevoegen Sync verbinding</translation>
</message>
@@ -1323,7 +1333,17 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1737,12 +1757,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>Fout</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Bestand &apos;%1&apos;&lt;br/&gt;kan niet worden geopend voor schrijven.&lt;br/&gt;&lt;br/&gt;De logging output kan &lt;b&gt;niet&lt;/b&gt; worden weggeschreven!&lt;/nobr&gt;</translation>
</message>
@@ -1750,53 +1770,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>Nieuwe versie beschikbaar</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Er is een nieuwe versie van de %1 Client beschikbaar.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is beschikbaar voor download. De geïnstalleerde versie is %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>Deze versie overslaan.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>Deze keer overslaan</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>Ophalen update</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation type="unfinished"/>
</message>
@@ -2050,28 +2070,43 @@ vragen om extra autorisaties tijdens installatie.</translation>
<translation>Verbinden...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>%1 map &apos;%2&apos; is gesynchroniseerd naar de lokale map &apos;%3&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>Sync map &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Waarschuwing:&lt;/strong&gt; De lokale map is niet leeg. Maak een keuze!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>Lokale synchronisatiemap</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2344,23 +2379,38 @@ We adviseren deze site niet te gebruiken.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
+ <source>Enable technical preview feature?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
-
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
-
-Switching to this mode will abort any currently running synchronization.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2371,12 +2421,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation type="unfinished"/>
</message>
@@ -2577,53 +2622,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Bestand %1 kan niet worden gedownload, omdat de naam conflicteert met een lokaal bestand</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>De download zal de vrije lokale schijfruimte reduceren tot onder het limiet</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>Vrije schijfruimte is minder dan %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>Bestand was verwijderd van de server</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>Het bestand kon niet volledig worden gedownload.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>Het gedownloade bestand is leeg, hoewel de server meldde dat het %1 zou moeten zijn.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>Het bestand is gewijzigd sinds het is gevonden</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>Fout bij schrijven van Metadata naar de database</translation>
</message>
@@ -3811,17 +3856,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>De header van het controlegetal is misvormd.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Het header controlegetal bevat een onbekend controlegetal type &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Het gedownloade bestand komt niet overeen met het controlegetal. Het wordt opnieuw verwerkt.</translation>
</message>
@@ -4192,11 +4237,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>Statusbericht</translation>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index a0b2d8351..6b4b79102 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -239,6 +239,21 @@
<translation>Usuń folder połączenia synchronizacji</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>Nie udało się stworzyć katalogu</translation>
@@ -409,11 +424,6 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Czy na pewno chcesz zatrzymać synchronizację folderu &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Uwaga:&lt;/b&gt; ta operacja &lt;b&gt;nie&lt;/b&gt; usunie plików z klienta.&lt;/p&gt;</translation>
@@ -1237,12 +1247,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>Dodaj folder połączenia synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>Dodaj połączenie synchronizacji</translation>
</message>
@@ -1317,7 +1327,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1727,12 +1747,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>Błąd</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Plik &apos;%1&apos;&lt;br&gt;nie może zostać otwarty do zapisu.&lt;br/&gt;&lt;br/&gt;Dane wyjściowe dziennika &lt;b&gt;nie&lt;/b&gt; mogą być zapisane!&lt;/nobr&gt;</translation>
</message>
@@ -1740,53 +1760,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>Nowa wersja dostępna</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Nowa wersja klienta %1 jest dostępna.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt;jest dostępna do pobrania. Zainstalowana wersja to %3.&lt;p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>Pomiń tą wersję</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>Pomiń tym razem</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>Uaktualnij</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation type="unfinished"/>
</message>
@@ -2040,28 +2060,43 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</translation>
<translation>Połącz...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>%1 katalog &apos;%2&apos; jest zsynchronizowany do katalogu lokalnego &apos;%3&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>Synchronizuj folder &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Uwaga:&lt;/strong&gt; katalog lokalny nie jest pusty. Bądź ostrożny !&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>Folder lokalnej synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2334,23 +2369,38 @@ Niezalecane jest jego użycie.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
- <translation>Włączyć funkcje eksperymentalne?</translation>
+ <source>Enable technical preview feature?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
-
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-Switching to this mode will abort any currently running synchronization.
-
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation>Włączyć funkcje eksperymentalne?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2361,12 +2411,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation>Włączenie trybu eksperymentalnego</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation type="unfinished"/>
</message>
@@ -2567,53 +2612,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Nie można pobrać pliku %1 ze względu na konflikt nazwy pliku lokalnego!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Ściągnięcie danych spowoduje, że wolna przestrzeń dyskowa spadnie poniżej limitu.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>Wolne miejsce na dysku jest mniejsze niż %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>Plik został usunięty z serwera</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>Ten plik nie mógł być całkowicie pobrany.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>Pobrany plik jest pusty pomimo tego, że według zapowiedzi serwera powinien mieć %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>Błąd podczas zapisu metadanych do bazy</translation>
</message>
@@ -3800,17 +3845,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"/>
</message>
@@ -4181,11 +4226,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>Status wiadomości</translation>
diff --git a/translations/client_pt.ts b/translations/client_pt.ts
index 6b51acf4f..57c888a10 100644
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -239,6 +239,21 @@
<translation>Remover ligação de sincronização de pasta</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>Não foi possível criar a pasta</translation>
@@ -409,11 +424,6 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Deseja mesmo parar a sincronização da pasta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; isto &lt;b&gt;não&lt;/b&gt; irá eliminar qualquer ficheiro.&lt;/p&gt;</translation>
@@ -1239,12 +1249,12 @@ Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados n
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>Adicionar Ligação de Sincronização de Pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>Adicionar Ligação de Sincronização</translation>
</message>
@@ -1319,7 +1329,17 @@ Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados n
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1729,12 +1749,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;O ficheiro &apos;%1&apos;&lt;br/&gt;não pode ser aberto para gravação.&lt;br/&gt;&lt;br/&gt;O ficheiro de registo de saída &lt;b&gt;não&lt;/b&gt; pode ser guardado!&lt;/nobr&gt;</translation>
</message>
@@ -1742,53 +1762,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>Disponível Nova Versão</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Está disponível uma nova versão do Cliente %1.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; está disponível para transferência. A versão instalada é a %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>Ignorar esta versão</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>Ignorar desta vez</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>Obter atualização</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation type="unfinished"/>
</message>
@@ -2042,28 +2062,43 @@ poderá pedir por privilégios adicionais durante o processo.</translation>
<translation>Ligar...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>%1 pasta &apos;%2&apos; é sincronizada para pasta local &apos;%3&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>Sincronizar a pasta &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Aviso:&lt;/strong&gt; a pasta local não está vazia. Escolha uma resolução!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>Pasta de Sincronização Local</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2336,23 +2371,38 @@ Não é aconselhada a sua utilização.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
- <translation>Ativar funcionalidades experimentais</translation>
+ <source>Enable technical preview feature?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
-
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
-
-Switching to this mode will abort any currently running synchronization.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation>Ativar funcionalidades experimentais</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2363,12 +2413,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation type="unfinished"/>
</message>
@@ -2569,53 +2614,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Não foi possível transferir o ficheiro %1 devido a um conflito com o nome de ficheiro local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>O Espaço livre no disco é inferior a %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>O ficheiro foi eliminado do servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>Não foi possível transferir o ficheiro na totalidade.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>O ficheiro transferido está vazio, apesar do servidor indicar que este deveria ter %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Ficheiro %1 não pode ser guardado devido à existência de um ficheiro local com o mesmo nome.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>O ficheiro alterou-se desde a sua descoberta</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>Erro ao gravar os metadados para a base de dados</translation>
</message>
@@ -3802,17 +3847,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>O cabeçalho de &quot;checksum&quot; está com problemas.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>O header checksum continha um tipo de checksum desconhecido &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>O ficheiro transferido não corresponde ao &quot;checksum&quot;, Este irá ser retomado.</translation>
</message>
@@ -4183,11 +4228,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>Mensagem de estado</translation>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index 10ca5c2dd..2986fe338 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -239,6 +239,21 @@
<translation>Remover a conexão de sincronização de pastas</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>Falha na criação de pasta</translation>
@@ -413,11 +428,6 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran
<translation>Desativar o suporte a arquivos virtuais...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation>Ativar suporte de arquivo virtual (experimental)...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Você realmente deseja para a sincronização desta pasta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Isto &lt;b&gt;não&lt;/b&gt; vai deletar qualquer arquivo.&lt;/p&gt;</translation>
@@ -1245,12 +1255,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>Adicionar Conexão de Sincronização de pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>Adicionar Conexão de Sincronização</translation>
</message>
@@ -1325,8 +1335,18 @@ If this was an accident and you decide to keep your files, they will be re-synce
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
- <translation>Use arquivos virtuais em vez de baixar conteúdo imediatamente (experimental)</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1582,7 +1602,9 @@ Observe que isso seleciona apenas de qual conjunto de atualizações são retira
<source>Files or folders matching a pattern will not be synchronized. Changes take effect the next time folders are synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation type="unfinished"/>
+ <translation>Arquivos ou pastas correspondentes a um padrão não serão sincronizados. As alterações terão efeito na próxima vez que as pastas forem sincronizadas.
+
+Os itens em que a exclusão é permitida serão excluídos se impedirem que um diretório seja removido. Isso é útil para metadados.</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="125"/>
@@ -1740,12 +1762,12 @@ Observe que o uso de qualquer opção de linha de comando de registro substituir
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Arquivo &apos;%1&apos;&lt;br/&gt;não pode ser aberto para escrita.&lt;br/&gt;&lt;br/&gt;A saída de log &lt;b&gt;não&lt;/b&gt; pode ser salva!&lt;/nobr&gt;</translation>
</message>
@@ -1753,54 +1775,54 @@ Observe que o uso de qualquer opção de linha de comando de registro substituir
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>Nova Versão Disponínel</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Uma nova versão %1 de Ciente está disponível.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; está disponível para baixar. A versão instalada é a %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>Pule esta versão</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>Pular desta vez</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>Atualizar</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation>Atualização Falhou</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Uma nova versão do %1 Cliente está disponível, mas o processo de atualização falhou.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt;  
foi baixado. A versão instalada é %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation>Pergunte novamente mais tarde</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation>Reinicie e atualize</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation>Atualizar manualmente</translation>
</message>
@@ -2053,28 +2075,43 @@ for additional privileges during the process.</source>
<translation>Conectar...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>%1 Pasta &apos;%2&apos; está sincronizada com pasta local &apos;%3&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>Sincronizar a pasta &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Aviso:&lt;/strong&gt; A pasta local não está vazia. Escolha uma resolução!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>Sincronizar Pasta Local</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2346,27 +2383,38 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
- <translation>Ativar recurso experimental?</translation>
+ <source>Enable technical preview feature?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
-
-Switching to this mode will abort any currently running synchronization.
-
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
- <translation>Quando o modo &quot;arquivos virtuais&quot; estiver habilitado, nenhum arquivo será baixado inicialmente. Em vez disso, um arquivo de espaço reservado será criado para cada arquivo existente no servidor. Quando um arquivo é aberto, seu conteúdo será baixado automaticamente. Alternativamente, os arquivos podem ser baixados manualmente usando o menu de contexto.
-O modo de arquivos virtuais é mutuamente exclusivo com a sincronização seletiva. As pastas atualmente não selecionadas serão traduzidas para pastas somente on-line e suas configurações de sincronização seletiva serão redefinidas.
-Mudar para este modo abortará qualquer sincronização em execução no momento.
-
-Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer problemas que surgirem.</translation>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation>Ativar recurso experimental?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2383,12 +2431,7 @@ Mudar para este modo abortará qualquer sincronização em execução no momento
Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer problemas que surgirem.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation>Ativar o modo experimental</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation>Fique seguro</translation>
</message>
@@ -2589,53 +2632,53 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>O arquivo %1 não pode ser baixado devido a um confronto local no nome do arquivo!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>O download reduziria o espaço livre no disco local abaixo do limite</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>O espaço livre no disco é inferior a %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation>Baixa do slot finalizada, mas não existe resposta!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>O arquivo foi eliminado do servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>O arquivo não pode ser baixado completamente.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>O arquivo baixado está vazio apesar do servidor anunciou que deveria ter %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>O arquivo %1 não pode ser salvo devido a um confronto com um nome de arquivo local!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>Arquivo foi alterado desde a descoberta</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
</message>
@@ -3825,17 +3868,17 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>O cabeçalho da soma de verificação está incorreto.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>A cabeçalho da soma de verificação continha um tipo de soma de verificação desconhecido &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>O arquivo baixado não coincide com o checksum, ele será retomado.</translation>
</message>
@@ -4206,11 +4249,6 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>S&amp;incronizar tudo do servidor (recomendado)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation>Use arquivos virtuais em vez de baixar conteúdo imediatamente (e&amp;xperimental)</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>Mensagem de status</translation>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index cb10efa3c..478e51ed6 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -239,6 +239,21 @@
<translation>Удалить подключение синхронизации каталога</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>Ошибка создания каталога</translation>
@@ -413,11 +428,6 @@ This action will abort any currently running synchronization.</source>
<translation>Отключить поддержку виртуальных файлов…</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation>Включить поддержку виртуальных файлов (экспериментально)…</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Вы действительно желаете остановить синхронизацию папки &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Примечание:&lt;/b&gt; Это действие &lt;b&gt;НЕ&lt;/b&gt; удалит ваши файлы.&lt;/p&gt;</translation>
@@ -1247,12 +1257,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>Добавить папку для синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>Добавить подключение для синхронизации</translation>
</message>
@@ -1327,8 +1337,18 @@ If this was an accident and you decide to keep your files, they will be re-synce
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
- <translation>Использовать виртуальные файлы вместо немедленного скачивания содержимого (экспериментальное)</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1584,7 +1604,9 @@ Note that this selects only what pool upgrades are taken from, and that there ar
<source>Files or folders matching a pattern will not be synchronized. Changes take effect the next time folders are synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation type="unfinished"/>
+ <translation>Соответствующие шаблону папки и файлы синхронизироваться не будут. Изменения вступят в силу в следующий раз, когда папки будут синхронизированы.
+
+Там, где удаление разрешено, элементы будут удаляться, если они не дают удалить каталог. Это полезно для метаданных.</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="125"/>
@@ -1742,12 +1764,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Файл &apos;%1&apos;&lt;br/&gt;не может быть открыт на запись.&lt;br/&gt;&lt;br/&gt;Журнал &lt;b&gt;не может&lt;/b&gt; быть сохранён!&lt;/nobr&gt;</translation>
</message>
@@ -1755,53 +1777,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>Доступна новая версия</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Доступна новая версия приложения %1.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; доступна для загрузки. Установленная версия: %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>Пропустить эту версию</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>Пропустить в этот раз</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>Получить обновление</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation>Обновление не удалось</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Доступна новая версия клиента %1, но процесс обновления не удался. &lt;/p&gt;&lt;p&gt;Было скачано &lt;b&gt;%2&lt;/b&gt;. Установленная версия — %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation>Попросить снова позже</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation>Перезапустить и продолжить</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation>Обновить вручную</translation>
</message>
@@ -2055,28 +2077,43 @@ for additional privileges during the process.</source>
<translation>Соединение...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>%1 каталог &apos;%2&apos; синхронизирован с локальным каталогом &apos;%3&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>Синхронизация папки &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Внимание:&lt;/strong&gt; Локальная папка не пуста. Выберите действие!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>Локальный каталог синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2349,29 +2386,38 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
- <translation>Включить экспериментальную возможность?</translation>
+ <source>Enable technical preview feature?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
-
-Switching to this mode will abort any currently running synchronization.
-
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
- <translation>Когда включён режим «виртуальных файлов», скачивание файлов с сервера происходит не сразу. Вместо этого для каждого файла на сервере создаётся файл-заглушка. При открытии файла его содержимое скачивается автоматически. Или файлы можно скачивать вручную через контекстное меню.
-
-Режим виртуальных файлов не совместим с выборочной синхронизацией. Не выбранные в данный момент каталоги будут преобразованы в каталоги, доступные только при сети, и настройки выборочной синхронизации будут сброшены.
-
-Включение этого режима прервёт любую идущую сейчас синхронизацию.
-
-Это новый экспериментальный режим. Если вы решите его использовать, пожалуйста сообщайте о всех проявляющихся проблемах.</translation>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation>Включить экспериментальную возможность?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2388,12 +2434,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
Это новый, экспериментальный режим. Если вы решите его использовать, пожалуйста сообщайте о любых проявляющихся проблемах.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation>Включить экспериментальный режим</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation>Отказаться от эксперимента</translation>
</message>
@@ -2594,53 +2635,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Файл %1 не может быть загружен из-за локального конфликта имен!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Скачивание сократит доступное пространство на локальном диске ниже допустимого предела</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>Свободное место на диске меньше, чем %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation>Слот скачивания завершён, но не было ответа!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>Файл был удален с сервера</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>Невозможно полностью загрузить файл.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>Скачанный файл пуст, хотя сервер заявил, что он должен быть %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Файл %1 не может быть сохранён из-за локального конфликта имен!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>После обнаружения файл был изменен</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>Ошибка записи метаданных в базу данных</translation>
</message>
@@ -3829,17 +3870,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>Некорректная контрольная сумма заголовка</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Заголовок контрольной суммы содержал неизвестный тип &apos;%1&apos; контрольной суммы</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Загруженный файл не соответствует контрольной сумме, операция будет возобновлена.</translation>
</message>
@@ -4210,11 +4251,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>С&amp;инхронизировать с сервера всё (рекомендуется)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation>Использовать виртуальные файлы вместо немедленного скачивания содержимого (&amp;экспериментальное)</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>Сообщение о состоянии</translation>
diff --git a/translations/client_sl.ts b/translations/client_sl.ts
index 550025478..8e6801c49 100644
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -239,6 +239,21 @@
<translation>Odstrani povezavo mape usklajevanja</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>Ustvarjanje mape je spodletelo</translation>
@@ -409,11 +424,6 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ali res želite zaustaviti usklajevanje mape &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Opomba:&lt;/b&gt; s tem datoteke iz odjemalca &lt;b&gt;ne bodo&lt;/b&gt; odstranjene.&lt;/p&gt;</translation>
@@ -1239,12 +1249,12 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom?
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>Dodaj povezavo za usklajevanje mape</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>Dodaj povezavo za usklajevanje</translation>
</message>
@@ -1319,7 +1329,17 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom?
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1729,12 +1749,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>Napaka</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Datoteke &apos;%1&apos;&lt;br/&gt;ni mogoče odpreti za pisanje.&lt;br/&gt;&lt;br/&gt;Dnevniškega zapisa &lt;b&gt;ni mogoče&lt;/b&gt; shraniti!&lt;/nobr&gt;</translation>
</message>
@@ -1742,53 +1762,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>Na voljo je novejša različica</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;Na voljo je nova različica odjemalca %1.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; je na voljo za prejem. Trenutno je nameščena različica %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>Preskoči to različico</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>Posodobitev tokrat preskoči</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>Pridobi posodobitve</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation type="unfinished"/>
</message>
@@ -2042,28 +2062,43 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation>
<translation>Vzpostavi povezavo ...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>%1 mapa &apos;%2&apos; je usklajena s krajevno mapo &apos;%3&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>Uskladi mapo &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Opozorilo:&lt;/strong&gt; krajevna mapa ni prazna. Izberite možnost za razrešitev problema!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>Krajevna mapa usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2336,23 +2371,38 @@ Uporaba ni priporočljiva.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
+ <source>Enable technical preview feature?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
-
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
-
-Switching to this mode will abort any currently running synchronization.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2363,12 +2413,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation>Omogoči preizkusni način</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation type="unfinished"/>
</message>
@@ -2569,53 +2614,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Datoteke %1 ni mogoče prejeti zaradi neskladja z imenom krajevne datoteke!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>Na disku je prostora manj kot %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>Datoteka je izbrisana s strežnika</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>Datoteke ni mogoče prejeti v celoti.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>Prejeta datoteka je prazna, čeprav je na strežniku velikosti %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Datoteke %1 ni mogoče shraniti zaradi neskladja z imenom obstoječe datoteke!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>Datoteka je bila spremenjena po usklajevanju seznama datotek</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
</message>
@@ -3802,17 +3847,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>Glava nadzorne vsote je napačno oblikovana.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Glava nadzorne vsote vsebuje neznano vrsto zapisa &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Prejeta datoteka ni skladna z nadzorno vsoto te datoteke, zato bo prenos ponovljen.</translation>
</message>
@@ -4183,11 +4228,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>Sporočilo stanja</translation>
diff --git a/translations/client_sv.ts b/translations/client_sv.ts
index a2a0e7183..7cfc83eb7 100644
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -239,6 +239,21 @@
<translation>Ta bort anslutning till mappsynkronisering</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>Kunde inte skapa mappen</translation>
@@ -409,11 +424,6 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vill du verkligen avbryta synkronisering av mappen &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Observera:&lt;/b&gt; Detta kommer &lt;b&gt;inte&lt;/b&gt; radera några filer.&lt;/p&gt;</translation>
@@ -1234,12 +1244,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>Lägg till mapp att synka.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>Lägg till anslutning.</translation>
</message>
@@ -1314,7 +1324,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1724,12 +1744,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>Fel</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;Filen &apos;%1&apos;&lt;br/&gt;kan inte öppnas för skrivning.&lt;br/&gt;&lt;br/&gt;Loggtexten kan &lt;b&gt;inte&lt;/b&gt; sparas!&lt;/nobr&gt;</translation>
</message>
@@ -1737,53 +1757,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>Ny version tillgänglig</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;En ny version av %1 klienten är tillgänglig.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; är tillgänglig för nedladdning. Den installerade versionen är %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>Hoppa över denna version</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>Hoppa över denna gång</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>Hämta uppdatering</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation type="unfinished"/>
</message>
@@ -2037,28 +2057,43 @@ ytterligare rättigheter under processen.</translation>
<translation>Anslut...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>%1 mappen &apos;%2&apos; är synkroniserad mot den lokala mappen &apos;%3&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>Synka mappen &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Varning:&lt;/strong&gt; Den lokala mappen är inte tom. Välj alternativ!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>Lokal mapp för synkning</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2331,23 +2366,38 @@ Det är inte lämpligt använda den.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
+ <source>Enable technical preview feature?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
-
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
-
-Switching to this mode will abort any currently running synchronization.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2358,12 +2408,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation type="unfinished"/>
</message>
@@ -2564,53 +2609,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Fil %1 kan inte laddas ner på grund av namnkonflikt med en lokal fil!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Nedladdningen skulle reducera det fria diskutrymmet under gränsen</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>Ledigt utrymme är under %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>Filen har tagits bort från servern</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>Filen kunde inte laddas ner fullständigt.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>Den nedladdade filen är tom men servern sa att den skulle vara %1.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Fil %1 kan inte sparas eftersom namnet krockar med en lokal fil!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>Filen har ändrats sedan upptäckten</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>Fel vid skrivning av metadata till databasen</translation>
</message>
@@ -3797,17 +3842,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>Checksummans huvud är felformaterad.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Checksummans huvud innehåller en okänd checksumma av typ &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Den nedladdade filen stämmer inte med checksumman, den kommer startas om.</translation>
</message>
@@ -4178,11 +4223,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>Statusmeddelande</translation>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index 16ea1813e..4ed95cfe4 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -239,6 +239,21 @@
<translation>ลบโฟลเดอร์ที่ประสานข้อมูลออก</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>สร้างโฟลเดอร์ล้มเหลว</translation>
@@ -413,11 +428,6 @@ This action will abort any currently running synchronization.</source>
<translation>ปิดใช้งานการสนับสนุนไฟล์เสมือน...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation>เปิดใช้งานการสนับสนุนไฟล์เสมือน (ทดลอง)...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;คุณต้องการหยุดการประสานข้อมูลโฟลเดอร์&lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;หมายเหตุ:&lt;/b&gt; นี้จะ &lt;b&gt;ไม่&lt;/b&gt; ลบไฟล์ใดๆ&lt;/p&gt;</translation>
@@ -1246,12 +1256,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>เพิ่มโฟลเดอร์ที่ต้องการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>เพิ่มการประสานข้อมูลให้ตรงกัน</translation>
</message>
@@ -1326,8 +1336,18 @@ If this was an accident and you decide to keep your files, they will be re-synce
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
- <translation>ใช้ไฟล์เสมือนแทนการดาวน์โหลดเนื้อหาทันที (โหมดเบต้า)</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1583,7 +1603,9 @@ Note that this selects only what pool upgrades are taken from, and that there ar
<source>Files or folders matching a pattern will not be synchronized. Changes take effect the next time folders are synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation type="unfinished"/>
+ <translation>ไฟล์หรือโฟลเดอร์ที่ตรงกับรูปแบบจะไม่ถูกประสานข้อมูล การเปลี่ยนแปลงจะมีผลเมื่อมีการประสานข้อมูลโฟลเดอร์ในครั้งถัดไป
+
+รายการที่อนุญาตให้ลบจะถูกลบถึงแม้ว่าจะมีการป้องกันการลบไดเรกทอรีออก สิ่งนี้มีประโยชน์มากสำหรับข้อมูลเมตา</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="125"/>
@@ -1741,12 +1763,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>ข้อผิดพลาด</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;ไฟล์ &apos;%1&apos;&lt;br/&gt;ไม่สามารถเปิดขึ้นมาเพื่อเขียนข้อมูลได้&lt;br/&gt;&lt;br/&gt;ผลลัพธ์ของไฟล์ log &lt;b&gt;ไม่สามารถ&lt;/b&gt; บันทึกข้อมูลได้!&lt;/nobr&gt;</translation>
</message>
@@ -1754,53 +1776,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>มีรุ่นใหม่ที่สามารถใช้งานได้</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;%1 มีรุ่นใหม่ของไคลเอ็นต์แล้ว&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; สามารถดาวน์โหลดได้ รุ่นที่ติดตั้งคือ %3</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>ข้ามรุ่นนี้</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>ข้ามเวลานี้</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>ได้รับการอัปเดต</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation>อัพเดทล้มเหลว</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;มีไคลเอ็นต์เวอร์ชันใหม่พร้อมใช้งาน %1 แต่กระบวนการอัปเดตล้มเหลว&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt;ได้ถูกดาวน์โหลดแล้ว เวอร์ชันที่ติดตั้งคือ %3&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation>ถามอีกครั้งในภายหลัง</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation>รีสตาร์ทและอัปเดต</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation>อัปเดตด้วยตนเอง</translation>
</message>
@@ -2053,28 +2075,43 @@ for additional privileges during the process.</source>
<translation>เชื่อมต่อ...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>%1 โฟลเดอร์ &apos;%2&apos; ถูกประสานข้อมูลไปยังโฟลเดอร์ในเครื่อง &apos;%3&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>ประสานข้อมูลโฟลเดอร์ &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;คำเตือน:&lt;/strong&gt; โฟลเดอร์ในเครื่องจะต้องไม่ว่างเปล่า เลือกความละเอียด!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>ประสานโฟลเดอร์ในเครื่อง</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2347,27 +2384,38 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
- <translation>เปิดใช้งานโหมดเบต้า?</translation>
+ <source>Enable technical preview feature?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
-
-Switching to this mode will abort any currently running synchronization.
-
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
- <translation>เมื่อเปิดใช้งานโหมด &quot;ไฟล์เสมือน&quot; จะไม่มีการดาวน์โหลดไฟล์ใดๆ ในตอนแรก แต่จะมีการสร้างไฟล์ &quot;%1&quot; สำหรับแต่ละไฟล์ที่มีอยู่บนเซิร์ฟเวอร์ สามารถดาวน์โหลดเนื้อหาโดยใช้ไฟล์เหล่านี้หรือใช้เมนูบริบท
-
-โหมดไฟล์เสมือนคือหากลบไฟล์หรือโฟลเดอร์ในระบบออนไลน์ไฟล์หรือโฟลเดอร์ในเครื่องของเราก็จะหายไปด้วย
-
-การสลับไปที่โหมดนี้จะยกเลิกการซิงค์ที่กำลังทำงานอยู่ และตอนนี้ยังอยู่ในช่วงทดลองใช้หากพบเจอปัญหาโปรดรายงานปัญหาด้วย</translation>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation>เปิดใช้งานโหมดเบต้า?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2382,12 +2430,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
การสลับไปที่โหมดนี้จะยกเลิกการซิงค์ที่กำลังทำงานอยู่ และตอนนี้ยังอยู่ในช่วงทดลองใช้หากพบเจอปัญหาโปรดรายงานปัญหาด้วย</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation>เปิดใช้งาน</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation>ไว้คราวหน้า</translation>
</message>
@@ -2588,53 +2631,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>ไฟล์ %1 ไม่สามารถดาวน์โหลดได้เพราะชื่อไฟล์ในเครื่องเหมือนกัน!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>การดาวน์โหลดจะช่วยลดพืนที่จัดเก็บภายในเครื่องที่ต่ำกว่าขีดจำกัด</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>พื้นที่ว่างในดิสก์น้อยกว่า %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation>สร้างช่องดาวน์โหลดสำเร็จแต่ไม่มีการตอบกลับ!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>ไฟล์ถูกลบออกจากเซิร์ฟเวอร์</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>ดาวน์โหลดไฟล์ไม่สำเร็จ</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>ไฟล์ที่ดาวน์โหลดว่างเปล่าแม้ว่าเซิร์ฟเวอร์ประกาศว่าควรจะเป็น %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>ไฟล์ %1 ไม่สามารถบันทึกได้เพราะชื่อไฟล์ในเครื่องเหมือนกัน!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>ไฟล์มีการเปลี่ยนแปลงตั้งแต่ถูกพบ</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>ข้อผิดพลาดในการเขียน metadata ไปยังฐานข้อมูล</translation>
</message>
@@ -3821,17 +3864,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>การตรวจสอบส่วนหัวผิดรูปแบบ</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>จากการตรวจสอบส่วนหัวมีประเภทที่ไม่รู้จัก &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>ไฟล์ที่ดาวน์โหลดมาไม่ตรงกับการตรวจสอบที่กลับคืนมา</translation>
</message>
@@ -4202,11 +4245,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ประสานข้อมูลทุกอย่างจากเซิร์ฟเวอร์ (แนะนำ)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation>ใช้ไฟล์เสมือนแทนการดาวน์โหลดเนื้อหาทันที (โหมดเบต้า)</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>ข้อความสถานะ</translation>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index 9136e4e09..7eff28ee0 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -239,6 +239,21 @@
<translation>Klasör eşitleme bağlantısını sil</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>Klasör oluşturma başarısız oldu</translation>
@@ -409,11 +424,6 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;i&gt;%1&lt;/i&gt; klasörünün eşitlemesini durdurmayı gerçekten istiyor musunuz?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Not:&lt;/b&gt; Bu işlem herhangi bir dosyayı &lt;b&gt;silmeyecektir&lt;/b&gt;.&lt;/p&gt;</translation>
@@ -1243,12 +1253,12 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>Klasör Eşitleme Bağlantısı Ekle</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>Eşitleme Bağlantısı Ekle</translation>
</message>
@@ -1323,8 +1333,18 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
- <translation>İçeriği hemen indirmek yerine sanal dosyaları kullan (deneysel)</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1735,12 +1755,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>Hata</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;&apos;%1&apos; dosyası&lt;br/&gt;yazmak üzere açılamadı.&lt;br/&gt;&lt;br/&gt;Günlük çıktısı &lt;b&gt;kaydedilemez&lt;/b&gt;!&lt;/nobr&gt;</translation>
</message>
@@ -1748,53 +1768,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>Yeni Sürüm Mevcut</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;%1 İstemcisi yeni sürümü mevcut.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; artık indirilebilir. Kurulu sürüm %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>Bu sürümü atla</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>Bu kez atla</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>Güncellemeyi al</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation type="unfinished"/>
</message>
@@ -2047,28 +2067,43 @@ for additional privileges during the process.</source>
<translation>Bağlan...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>%1 klasörü &apos;%2&apos;, yerel &apos;%3&apos; klasörü ile eşitlendi</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>&apos;%1&apos; klasörünü eşitle</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Uyarı:&lt;/strong&gt; Yerel klasör boş değil. Bir çözüm seçin!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>Yerel Eşitleme Klasörü</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2341,23 +2376,38 @@ Kullanmanız önerilmez.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
- <translation>Deneysel özelliği etkinleştirilsin mi?</translation>
+ <source>Enable technical preview feature?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
-
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-Switching to this mode will abort any currently running synchronization.
-
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation>Deneysel özelliği etkinleştirilsin mi?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2368,12 +2418,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation>Deneysel modu etkinleştir</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation>Güvenli kal</translation>
</message>
@@ -2574,53 +2619,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>%1 dosyası, yerel dosya adı çakışması nedeniyle indirilemiyor!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>Dosya indirimi boş disk alanını belirlenen limitin altına düşürecektir.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>Boş disk alanı %1 altında</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>Dosya sunucudan silindi</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>Dosya tamamıyla indirilemedi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>Sunucu boyutunu %1 olarak duyurmasına rağmen indirilen dosya boş.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Yerel bir dosya ismi ile çakıştığından, %1 dosyası kaydedilemedi!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>Dosya, bulunduğundan itibaren değişmiş</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>Veritabanına üstveri yazma hatası</translation>
</message>
@@ -3807,17 +3852,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>Sağlama toplam başlığı bozulmuş.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Sağlama başlığı bilinmeyen &apos;%1&apos; sağlama tipi içeriyor</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>İndirilen dosya sağlama toplamı ile eşleşmiyor, devam edilecek.</translation>
</message>
@@ -4188,11 +4233,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>Durum iletisi</translation>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index ed121c1be..b39aac6cd 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -239,6 +239,21 @@
<translation>断开文件夹同步</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>Enable virtual file support %1...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="446"/>
<source>Folder creation failed</source>
<translation>文件夹创建失败</translation>
@@ -409,11 +424,6 @@ This action will abort any currently running synchronization.</source>
<translation>关闭虚拟文件</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
- <source>Enable virtual file support (experimental)...</source>
- <translation>开启虚拟文件 (实验中)...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="504"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;你确定要停止文件夹同步? &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; 这 &lt;b&gt;不会&lt;/b&gt; 删除任何文件&lt;/p&gt;</translation>
@@ -1239,12 +1249,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="571"/>
+ <location filename="../src/gui/folderwizard.cpp" line="572"/>
<source>Add Folder Sync Connection</source>
<translation>添加同步文件夹</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="573"/>
+ <location filename="../src/gui/folderwizard.cpp" line="574"/>
<source>Add Sync Connection</source>
<translation>添加同步连接</translation>
</message>
@@ -1319,8 +1329,18 @@ If this was an accident and you decide to keep your files, they will be re-synce
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
- <source>Use virtual files instead of downloading content immediately (experimental)</source>
- <translation>使用虚拟文件,而不是立刻下载内容 (实验性功能)</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="487"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1729,12 +1749,12 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="169"/>
+ <location filename="../src/libsync/logger.cpp" line="173"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="170"/>
+ <location filename="../src/libsync/logger.cpp" line="174"/>
<source>&lt;nobr&gt;File &apos;%1&apos;&lt;br/&gt;cannot be opened for writing.&lt;br/&gt;&lt;br/&gt;The log output can &lt;b&gt;not&lt;/b&gt; be saved!&lt;/nobr&gt;</source>
<translation>&lt;nobr&gt;文件 &apos;%1&apos;&lt;br/&gt;不能写入。&lt;br/&gt;&lt;br/&gt;将&lt;b&gt;不&lt;/b&gt;能保存日志输出!&lt;/nobr&gt;</translation>
</message>
@@ -1742,53 +1762,53 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="380"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="391"/>
<source>New Version Available</source>
<translation>新版本可用</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="386"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="397"/>
<source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;新版本的 %1 客户端可用。&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; 已经开放下载。已安装的版本是 %3。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="399"/>
- <location filename="../src/gui/updater/ocupdater.cpp" line="449"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="410"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="460"/>
<source>Skip this version</source>
<translation>跳过这个版本</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="400"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="411"/>
<source>Skip this time</source>
<translation>本次跳过</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="401"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="412"/>
<source>Get update</source>
<translation>获取更新</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="430"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
<translation>更新失败</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="436"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
<translation>&lt;p&gt;新版本的 %1 的客户端可用,但是更新失败&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; 已经下载完毕. 已安装的版本是 %3.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="450"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
<source>Ask again later</source>
<translation>以后询问我</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="451"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
<translation>重启以更新</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="452"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
<translation>手动更新</translation>
</message>
@@ -2042,28 +2062,43 @@ for additional privileges during the process.</source>
<translation>连接...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="173"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
+ <source>Use &amp;virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(tech preview)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
<source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
<translation>%1 文件夹 &apos;%2&apos; 将被同步到本地文件夹 &apos;%3&apos;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="179"/>
<source>Sync the folder &apos;%1&apos;</source>
<translation>同步文件夹 %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="184"/>
<source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;警告:&lt;/strong&gt; 本地目录非空。选择一个操作!&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="312"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="315"/>
<source>Local Sync Folder</source>
<translation>本地同步文件夹</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="348"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -2335,29 +2370,38 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/>
- <source>Enable experimental feature?</source>
- <translation>启用实验性功能?</translation>
+ <source>Enable technical preview feature?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
- <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a placeholder file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively files can be downloaded manually by using their context menu.
-
-The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
-
-Switching to this mode will abort any currently running synchronization.
+ <source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
-This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
- <translation>开启 虚拟文件 模式时开始不会有任何的文件被下载,相反我们会为每个服务器上的文件创造一个占位符文件,当文件被打开时我们会自动把文件的内容下载下来.。当然,您也可以手动在菜单上下载文件。
-
-虚拟文件模式与选择同步模式互斥,当您开启虚拟文件模式时,当前没有被选择的文件夹会被转换成仅线上的文件夹,并且您的选择同步设置会被重置。
-
-如果您切换到这个模式会把当前正在同步的文件取消。
-
-这是一个较新且处于实验状态的模式,如果您选择使用这个模式,请像我们反馈可能出现的问题</translation>
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="262"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
+ <source>Continue to use selective sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
+ <source>Enable experimental feature?</source>
+ <translation>启用实验性功能?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
+ <source>Enable experimental placeholder mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead, a tiny &quot;%1&quot; file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
@@ -2368,12 +2412,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="276"/>
- <source>Enable experimental mode</source>
- <translation>允许试验模式</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/>
<source>Stay safe</source>
<translation>保持安全</translation>
</message>
@@ -2574,53 +2613,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="442"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="444"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>由于本地文件名冲突,文件 %1 无法下载。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="491"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
<source>The download would reduce free local disk space below the limit</source>
<translation>在当前限制下,下载将会减少本地磁盘的剩余空间.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>Free space on disk is less than %1</source>
<translation>空闲磁盘空间少于 %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="629"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="633"/>
<source>Download slot finished, but there was no reply!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="682"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
<source>File was deleted from server</source>
<translation>已从服务器删除文件</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="753"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="757"/>
<source>The file could not be downloaded completely.</source>
<translation>文件无法完整下载。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="760"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="764"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation>虽然服务器宣称已完成 %1,但实际下载文件为空。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="944"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>由于本地文件名冲突,文件 %1 无法保存。</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="363"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="985"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="989"/>
<source>File has changed since discovery</source>
<translation>自从发现文件以来,它已经被改变了</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="1051"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1055"/>
<source>Error writing metadata to the database</source>
<translation>向数据库写入元数据错误</translation>
</message>
@@ -3809,17 +3848,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="319"/>
+ <location filename="../src/common/checksums.cpp" line="336"/>
<source>The checksum header is malformed.</source>
<translation>校验异常</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="346"/>
+ <location filename="../src/common/checksums.cpp" line="363"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>校验头包含未知的校验类型 &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="350"/>
+ <location filename="../src/common/checksums.cpp" line="367"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>下载的文件校验失败,将会回退。</translation>
</message>
@@ -4190,11 +4229,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>同步服务器的所有内容 (推荐)(&amp;S)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="430"/>
- <source>Use virtual files instead of downloading content immediately (e&amp;xperimental)</source>
- <translation>使用虚拟文件,而不是立刻下载内容 (实验性功能)(&amp;X)</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/>
<source>Status message</source>
<translation>状态信息</translation>