diff options
| author | Dominik Schmidt <dev@dominik-schmidt.de> | 2020-11-13 04:26:50 +0300 |
|---|---|---|
| committer | Dominik Schmidt <dev@dominik-schmidt.de> | 2020-11-13 04:26:50 +0300 |
| commit | 1a17af13853de45a14564d3f41687881124b6826 (patch) | |
| tree | 624a3e2290a75cfc88fb7342b88c42dcc61f1b1b | |
| parent | 585182a98fb4eac16055a85b17a653fce2d1a345 (diff) | |
[tx] updated client translations from transifex
| -rw-r--r-- | translations/client_cs.ts | 1124 | ||||
| -rw-r--r-- | translations/client_de.ts | 1169 | ||||
| -rw-r--r-- | translations/client_el.ts | 110 | ||||
| -rw-r--r-- | translations/client_es.ts | 118 | ||||
| -rw-r--r-- | translations/client_fa.ts | 110 | ||||
| -rw-r--r-- | translations/client_fr.ts | 110 | ||||
| -rw-r--r-- | translations/client_gl.ts | 112 | ||||
| -rw-r--r-- | translations/client_it.ts | 110 | ||||
| -rw-r--r-- | translations/client_ja.ts | 1128 | ||||
| -rw-r--r-- | translations/client_nb_NO.ts | 1179 | ||||
| -rw-r--r-- | translations/client_nl.ts | 114 | ||||
| -rw-r--r-- | translations/client_pl.ts | 110 | ||||
| -rw-r--r-- | translations/client_pt.ts | 1179 | ||||
| -rw-r--r-- | translations/client_pt_BR.ts | 112 | ||||
| -rw-r--r-- | translations/client_ru.ts | 110 | ||||
| -rw-r--r-- | translations/client_sl.ts | 110 | ||||
| -rw-r--r-- | translations/client_sv.ts | 110 | ||||
| -rw-r--r-- | translations/client_th.ts | 1257 | ||||
| -rw-r--r-- | translations/client_tr.ts | 110 | ||||
| -rw-r--r-- | translations/client_zh_CN.ts | 110 | ||||
| -rw-r--r-- | translations/client_zh_TW.ts | 110 |
21 files changed, 4476 insertions, 4226 deletions
diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 3cec686be..370e02dce 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -87,22 +87,45 @@ <translation>Formulář</translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="58"/> + <location filename="../src/gui/notificationwidget.ui" line="73"/> <source>Lorem ipsum dolor sit amet</source> <translation>Lorem ipsum dolor sit amet</translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="71"/> + <location filename="../src/gui/notificationwidget.ui" line="86"/> <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source> <translation>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="91"/> + <location filename="../src/gui/notificationwidget.ui" line="106"/> <source>TextLabel</source> <translation>Textový popisek</translation> </message> </context> <context> + <name>OCC::AboutDialog</name> + <message> + <location filename="../src/gui/aboutdialog.ui" line="24"/> + <source>About</source> + <translation>O aplikaci</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.ui" line="88"/> + <source>TextLabel</source> + <translation>Textový popisek</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.ui" line="96"/> + <source>Versions</source> + <translation>Verze</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.cpp" line="28"/> + <source>About %1</source> + <translation>O %1</translation> + </message> +</context> +<context> <name>OCC::AbstractNetworkJob</name> <message> <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> @@ -121,6 +144,14 @@ </message> </context> <context> + <name>OCC::Account</name> + <message> + <location filename="../src/libsync/account.cpp" line="121"/> + <source>%1@%2</source> + <translation>%1@%2</translation> + </message> +</context> +<context> <name>OCC::AccountSettings</name> <message> <location filename="../src/gui/accountsettings.ui" line="14"/> @@ -169,9 +200,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="512"/> - <location filename="../src/gui/accountsettings.cpp" line="625"/> - <location filename="../src/gui/accountsettings.cpp" line="1083"/> + <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="611"/> + <location filename="../src/gui/accountsettings.cpp" line="1048"/> <source>Cancel</source> <translation>Zrušit</translation> </message> @@ -181,87 +212,67 @@ <translation>Připojen k <server> jako <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="180"/> <source>No account configured.</source> <translation>Žádný účet nenastaven.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="200"/> - <source>Add new</source> - <translation>Přidat nový</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="209"/> + <location filename="../src/gui/accountsettings.cpp" line="203"/> <source>Remove</source> <translation>Odebrat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="213"/> + <location filename="../src/gui/accountsettings.cpp" line="207"/> <source>Account</source> <translation>Účet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="297"/> <source>Choose what to sync</source> <translation>Vybrat co sesynchronizovat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Force sync now</source> <translation>Vynutit synchronizaci nyní</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="305"/> <source>Restart sync</source> <translation>Restartovat synchronizaci</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="327"/> + <location filename="../src/gui/accountsettings.cpp" line="314"/> <source>Remove folder sync connection</source> <translation>Odstranit připojení synchronizace adresáře</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>Enable virtual file support %1...</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>(tech preview)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>(experimental)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="445"/> + <location filename="../src/gui/accountsettings.cpp" line="433"/> <source>Folder creation failed</source> <translation>Vytvoření adresáře selhalo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="434"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Nelze vytvořit místní adresář <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="504"/> + <location filename="../src/gui/accountsettings.cpp" line="491"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Potvrdit odstranění připojení synchronizace adresáře</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="511"/> + <location filename="../src/gui/accountsettings.cpp" line="499"/> <source>Remove Folder Sync Connection</source> <translation>Odstranit připojení synchronizace adresáře</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="616"/> + <location filename="../src/gui/accountsettings.cpp" line="602"/> <source>Disable virtual file support?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="617"/> + <location filename="../src/gui/accountsettings.cpp" line="603"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -270,173 +281,183 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="624"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Disable support</source> <translation>Zakázat podporu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="734"/> + <location filename="../src/gui/accountsettings.cpp" line="712"/> <source>Sync Running</source> <translation>Synchronizace probíhá</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="735"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Operace synchronizace právě probíhá.<br/>Přejete si ji ukončit?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="830"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>%1 in use</source> <translation>%1 používaný</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="857"/> + <location filename="../src/gui/accountsettings.cpp" line="836"/> <source>%1 as <i>%2</i></source> <translation>%1 jako <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="845"/> <source>Connected to %1.</source> <translation>Připojeno k %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="871"/> + <location filename="../src/gui/accountsettings.cpp" line="850"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 je dočasně nedostupný.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="874"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is currently in maintenance mode.</source> <translation>server %1 je v režimu údržby.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="877"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Signed out from %1.</source> <translation>Odhlášeno z %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="887"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Connecting to %1...</source> <translation>Připojeno k %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="871"/> <source>No connection to %1 at %2.</source> <translation>Bez připojení k %1 na %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="910"/> <source>Log in</source> <translation>Přihlásit</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1026"/> + <location filename="../src/gui/accountsettings.cpp" line="1005"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Tyto složky nebyly synchronizovány, protože jsou příšliš velké:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1028"/> + <location filename="../src/gui/accountsettings.cpp" line="1007"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Tyto složky nebyly synchronizovány, protože se nachází na externím úložišti:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1029"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Tyto složky nebyly synchronizovány, protože jsou příliš velké, nebo se nachází na externím úložišti:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1075"/> + <location filename="../src/gui/accountsettings.cpp" line="1041"/> <source>Confirm Account Removal</source> <translation>Potvrdit odstranění účtu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1076"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Opravdu chcete odstranit připojení k účtu <i>%1</i>?</p><p><b>Poznámka:</b> Toto <b>neodstraní</b> žádné soubory.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1082"/> + <location filename="../src/gui/accountsettings.cpp" line="1047"/> <source>Remove connection</source> <translation>Odstranit připojení</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="306"/> + <location filename="../src/gui/accountsettings.cpp" line="293"/> <source>Open folder</source> <translation>Otevřít adresář</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="205"/> - <location filename="../src/gui/accountsettings.cpp" line="933"/> + <location filename="../src/gui/accountsettings.cpp" line="199"/> + <location filename="../src/gui/accountsettings.cpp" line="912"/> <source>Log out</source> <translation>Odhlásit se</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="265"/> + <location filename="../src/gui/accountsettings.cpp" line="252"/> <source>Open local folder</source> <translation>Otevřít místní složku</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="273"/> + <location filename="../src/gui/accountsettings.cpp" line="260"/> <source>Open folder in browser</source> <translation>Otevřít složku v prohlížeči</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="324"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Resume sync</source> <translation>Pokračovat v synchronizaci</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="324"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Pause sync</source> <translation>Pozastavit synchronizaci</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="331"/> + <location filename="../src/gui/accountsettings.cpp" line="318"/> <source>Availability</source> <translation>Dostupnost</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="348"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source>Disable virtual file support...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="505"/> + <location filename="../src/gui/accountsettings.cpp" line="343"/> + <source>Enable virtual file support%1...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="343"/> + <source> (experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="492"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Opravdu chcete zastavit synchronizaci adresáře <i>%1</i>?</p><p><b>Poznámka:</b> Toto <b>neodstraní</b> žádné soubory.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="817"/> + <location filename="../src/gui/accountsettings.cpp" line="796"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>Používaných %1 (%3%) z %2. Některé adresáře včetně připojených síťových nebo sdílených adresářů mohou mít odlišné limity.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="818"/> + <location filename="../src/gui/accountsettings.cpp" line="797"/> <source>%1 of %2 in use</source> <translation>Používaných %1 z %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="827"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Currently there is no storage usage information available.</source> <translation>Momentálně nejsou k dispozici žádné informace o využití úložiště.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="864"/> + <location filename="../src/gui/accountsettings.cpp" line="843"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="884"/> + <location filename="../src/gui/accountsettings.cpp" line="863"/> <source>Obtaining authorization from the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="897"/> + <location filename="../src/gui/accountsettings.cpp" line="876"/> <source>Server configuration error: %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="908"/> + <location filename="../src/gui/accountsettings.cpp" line="887"/> <source>No %1 connection configured.</source> <translation>Žádné spojení s %1 nenastaveno.</translation> </message> @@ -492,12 +513,12 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 na %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 na %2 (odpojeno)</translation> </message> @@ -513,44 +534,44 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="515"/> - <location filename="../src/gui/activitywidget.cpp" line="563"/> + <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="570"/> <source>Server Activity</source> <translation>Aktivita serveru</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Protokol synchronizace</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>Nesesynchronizováno</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="574"/> + <location filename="../src/gui/activitywidget.cpp" line="581"/> <source>Not Synced (%1)</source> <extracomment>%1 is the number of not synced files.</extracomment> <translation>Nesesynchronizováno (%1)</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="606"/> + <location filename="../src/gui/activitywidget.cpp" line="613"/> <source>The server activity list has been copied to the clipboard.</source> <translation>Výpis aktivity serveru byl zkopírován do schránky.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="610"/> + <location filename="../src/gui/activitywidget.cpp" line="617"/> <source>The sync activity list has been copied to the clipboard.</source> <translation>Výpis aktivity synchronizace byl zkopírován do schránky.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="613"/> + <location filename="../src/gui/activitywidget.cpp" line="620"/> <source>The list of unsynced items has been copied to the clipboard.</source> <translation>Seznam nesynchronizovaných položek byl zkopírován do schránky.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="618"/> + <location filename="../src/gui/activitywidget.cpp" line="625"/> <source>Copied to clipboard</source> <translation>Zkopírováno do schránky</translation> </message> @@ -570,47 +591,47 @@ This action will abort any currently running synchronization.</source> <translation>Textový popisek</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Aktivity serveru</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Kopie</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="93"/> + <location filename="../src/gui/activitywidget.cpp" line="100"/> <source>Copy the activity list to the clipboard.</source> <translation>Kopírovat záznam aktivity do schránky.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Upozornění</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="351"/> + <location filename="../src/gui/activitywidget.cpp" line="358"/> <source>%n notifications(s) for %1.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="357"/> + <location filename="../src/gui/activitywidget.cpp" line="364"/> <source>%n notifications(s) for %1 and %2.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="359"/> + <location filename="../src/gui/activitywidget.cpp" line="366"/> <source>New notifications for %1, %2 and other accounts.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="362"/> + <location filename="../src/gui/activitywidget.cpp" line="369"/> <source>Open the activity view for details.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="145"/> + <location filename="../src/gui/activitywidget.cpp" line="152"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Účet %1 nemá zapnuté aktivity.</translation> </message> @@ -661,42 +682,42 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="134"/> + <location filename="../src/gui/application.cpp" line="136"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="138"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="142"/> + <location filename="../src/gui/application.cpp" line="144"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="149"/> + <location filename="../src/gui/application.cpp" line="151"/> <source>Quit</source> <translation>Ukončit</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="150"/> + <location filename="../src/gui/application.cpp" line="152"/> <source>Continue</source> <translation>Pokračovat</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="299"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Error accessing the configuration file</source> <translation>Chyba přístupu ke konfiguračnímu souboru</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="300"/> + <location filename="../src/gui/application.cpp" line="310"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Došlo k chybě při přístupu ke konfigurační soubor %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="303"/> + <location filename="../src/gui/application.cpp" line="313"/> <source>Quit ownCloud</source> <translation>Ukončit ownCloud</translation> </message> @@ -727,7 +748,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1135"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1140"/> <source>Error writing metadata to the database</source> <translation>Chyba zápisu metadat do databáze</translation> </message> @@ -805,134 +826,134 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="172"/> + <location filename="../src/gui/folder.cpp" line="173"/> <source>Local folder %1 does not exist.</source> <translation>Místní adresář %1 neexistuje.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="175"/> + <location filename="../src/gui/folder.cpp" line="176"/> <source>%1 should be a folder but is not.</source> <translation>%1 by měl být adresář, ale není.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="178"/> + <location filename="../src/gui/folder.cpp" line="179"/> <source>%1 is not readable.</source> <translation>%1 není čitelný.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 byl odebrán.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 byl aktualizován.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 byl přejmenován na %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2.</source> <translation>%1 byl přemístěn do %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="414"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 soubor bude smazán.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="420"/> + <location filename="../src/gui/folder.cpp" line="421"/> <source>%1 and %n other file(s) have been added.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 přidán.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="427"/> + <location filename="../src/gui/folder.cpp" line="428"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 soubor byl aktualizován.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="434"/> + <location filename="../src/gui/folder.cpp" line="435"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 byl přejmenován na %2.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="441"/> + <location filename="../src/gui/folder.cpp" line="442"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 byl přesunut do %2.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="448"/> + <location filename="../src/gui/folder.cpp" line="449"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 má problém se synchronizací. Prosím zkontrolujte chybový soubor.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="455"/> + <location filename="../src/gui/folder.cpp" line="456"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 soubor nemůže být synchronizován kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 nebyl kvůli chybě synchronizován. Detaily jsou k nalezení v logu.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="463"/> + <location filename="../src/gui/folder.cpp" line="464"/> <source>Sync Activity</source> <translation>Průběh synchronizace</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="800"/> <source>Could not read system exclude file</source> <translation>Nezdařilo se přečtení systémového exclude souboru</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1045"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Nová složka větší než %1 MB byla přidána: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>A folder from an external storage has been added. </source> <translation>Byla přidána složka z externího úložiště.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1049"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Pokud to chcete stáhnout, běžte do nastavení a vyberte to.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1109"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1112"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <source>Changes in synchronized folders could not be tracked reliably. This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default). @@ -941,7 +962,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1208"/> + <location filename="../src/gui/folder.cpp" line="1197"/> <source>All files in the sync folder '%1' folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to keep the files, they will be re-synced with the server if you have rights to do so. @@ -951,7 +972,7 @@ Tyto soubory budou smazány i ve vaší místní synchronizované složce a nebu Rozhodnete-li se soubory smazat, budou vám nedostupné, nejste-li jejich vlastníkem.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1202"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -960,17 +981,17 @@ Jste si jisti, že chcete tyto akce synchronizovat se serverem? Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze serveru.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1217"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>Odstranit všechny soubory?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Odstranit všechny soubory</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Ponechat soubory</translation> </message> @@ -978,107 +999,107 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="357"/> <source>Could not reset folder state</source> <translation>Nelze obnovit stav adresáře</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="356"/> + <location filename="../src/gui/folderman.cpp" line="358"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Byl nalezen starý záznam synchronizace '%1', ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation> (záloha)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation> (záloha %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Undefined State.</source> <translation>Nedefinovaný stav.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1332"/> <source>Waiting to start syncing.</source> <translation>Čeká na spuštění synchronizace.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>Preparing for sync.</source> <translation>Příprava na synchronizaci.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1336"/> + <location filename="../src/gui/folderman.cpp" line="1338"/> <source>Sync is running.</source> <translation>Synchronizace probíhá.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronizace byla úspěšně dokončena, nevyřešené konflikty</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1343"/> + <location filename="../src/gui/folderman.cpp" line="1345"/> <source>Last Sync was successful.</source> <translation>Poslední synchronizace byla úspěšná.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>Chyba nastavení.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>Zrušení uživatelem.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>Sync is paused.</source> <translation>Synchronizace pozastavena.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1361"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronizace je pozastavena)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1369"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <source>No valid folder selected!</source> <translation>Nebyl vybrán platný adresář!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path does not exist!</source> <translation>Vybraná cesta ke složce neexistuje!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1382"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>The selected path is not a folder!</source> <translation>Vybraná cesta nevede do adresáře!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1391"/> <source>You have no permission to write to the selected folder!</source> <translation>Nemáte oprávnění pro zápis do zvoleného adresáře!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1456"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Ze serveru se do tohoto umístění již synchronizuje. Prosím zvolte jinou místní složku!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1436"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>Místní adresář %1 již obsahuje podadresář použitý pro synchronizaci odesílání. Zvolte prosím jiný!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1442"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>Místní adresář %1 je již obsažen ve adresáři použitém pro synchronizaci. Vyberte prosím jiný!</translation> </message> @@ -1086,16 +1107,11 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <context> <name>OCC::FolderStatusDelegate</name> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="47"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="46"/> <source>Add Folder Sync Connection</source> <translation>Přidat synchronizaci adresáře</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="248"/> - <source>Synchronizing with local folder</source> - <translation>Synchronizace s místním adresářem</translation> - </message> - <message> <location filename="../src/gui/folderstatusdelegate.cpp" line="299"/> <source>File</source> <translation>Soubor</translation> @@ -1146,107 +1162,117 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <translation>Jsou zde nevyřešené konflikty. Klikněte pro detaily.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="897"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <source>Synchronizing VirtualFiles with local folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <source>Synchronizing with local folder</source> + <translation>Synchronizace s místním adresářem</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in remote '%1'</source> <translation>Zjišťuji změny ve vzdáleném '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="901"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> <source>Checking for changes in local '%1'</source> <translation>Zjišťuji změny v místním '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="908"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> <source>Reconciling changes</source> <translation>Srovnávám změny</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="943"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="946"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronizuji %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>stahování %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="986"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>nahrávání %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 ze %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1015"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 zbývá, %1 ze %2, soubor %3 z %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1023"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 z %2, soubor %3 z %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1030"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> <source>file %1 of %2</source> <translation>soubor %1 z %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> <source>Waiting...</source> <translation>Chvíli strpení...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Čeká se na %n další adresář...</numerusform><numerusform>Čeká se na %n další adresáře...</numerusform><numerusform>Čeká se na %n dalších adresářů...</numerusform><numerusform>Čeká se na %n dalších adresářů...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> <source>Preparing to sync...</source> <translation>Synchronizace se připravuje...</translation> </message> @@ -1270,12 +1296,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="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Folder Sync Connection</source> <translation>Přidat synchronizaci adresáře</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="576"/> + <location filename="../src/gui/folderwizard.cpp" line="578"/> <source>Add Sync Connection</source> <translation>Přidat synchronizační připojení</translation> </message> @@ -1283,17 +1309,17 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="68"/> + <location filename="../src/gui/folderwizard.cpp" line="69"/> <source>Click to select a local folder to sync.</source> <translation>Kliknutím zvolíte místní adresář k synchronizaci.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="75"/> + <location filename="../src/gui/folderwizard.cpp" line="76"/> <source>Enter the path to the local folder.</source> <translation>Zadejte cestu k místnímu adresáři.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="136"/> + <location filename="../src/gui/folderwizard.cpp" line="137"/> <source>Select the source folder</source> <translation>Zvolte zdrojový adresář</translation> </message> @@ -1301,52 +1327,52 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="184"/> + <location filename="../src/gui/folderwizard.cpp" line="185"/> <source>Create Remote Folder</source> <translation>Vytvořit vzdálený adresář</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="185"/> + <location filename="../src/gui/folderwizard.cpp" line="186"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Zadejte název nově vytvářeného adresáře níže '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="215"/> + <location filename="../src/gui/folderwizard.cpp" line="216"/> <source>Folder was successfully created on %1.</source> <translation>Adresář byl úspěšně vytvořen na %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="226"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Authentication failed accessing %1</source> <translation>Ověření selhalo při připojení %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="228"/> + <location filename="../src/gui/folderwizard.cpp" line="229"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Na %1 selhalo vytvoření adresáře. Zkontrolujte to prosím ručně.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="247"/> <source>Failed to list a folder. Error: %1</source> <translation>Chyba při vypsání adresáře. Chyba: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="328"/> <source>Choose this to sync the entire account</source> <translation>Zvolte toto k provedení synchronizace celého účtu</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="440"/> <source>This folder is already being synced.</source> <translation>Tento adresář je již synchronizován.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="442"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Již synchronizujete adresář <i>%1</i>, který je adresáři <i>%2</i> nadřazený.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="444"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1354,30 +1380,30 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> - <source>Use virtual files instead of downloading content immediately %1</source> + <location filename="../src/gui/folderwizard.cpp" line="485"/> + <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="489"/> - <source>(tech preview)</source> + <location filename="../src/gui/folderwizard.cpp" line="485"/> + <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="489"/> - <source>(experimental)</source> + <location filename="../src/gui/folderwizard.cpp" line="519"/> + <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="49"/> + <location filename="../src/gui/folderwizard.cpp" line="50"/> <source><b>Warning:</b> %1</source> <translation><b>Varování:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="51"/> + <location filename="../src/gui/folderwizard.cpp" line="52"/> <source><b>Warning:</b></source> <translation><b>Varování:</b></translation> </message> @@ -1426,48 +1452,73 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <translation>Obecná nastavení</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="55"/> - <source>For System Tray</source> - <translation>Pro systémovou lištu</translation> + <location filename="../src/gui/generalsettings.ui" line="80"/> + <source>Sync hidden files</source> + <translation>Synchronizovat skryté soubory</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="109"/> + <source>Log Settings</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="184"/> + <location filename="../src/gui/generalsettings.ui" line="136"/> + <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="196"/> <source>Network</source> <translation>Síť</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="257"/> + <location filename="../src/gui/generalsettings.ui" line="208"/> + <source>Updates</source> + <translation>Aktualizace</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="237"/> <source>stable</source> <translation>stable</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="262"/> + <location filename="../src/gui/generalsettings.ui" line="242"/> <source>beta</source> <translation>beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="68"/> + <location filename="../src/gui/generalsettings.ui" line="337"/> + <source>About</source> + <translation>O aplikaci</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="65"/> <source>Advanced</source> <translation>Pokročilé</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="100"/> + <location filename="../src/gui/generalsettings.ui" line="41"/> + <source>Use &Monochrome Icons in the system tray</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="144"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Zeptat se před synchronizací složek větších než</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="120"/> + <location filename="../src/gui/generalsettings.ui" line="164"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="186"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Zeptat se na potvrzení před synchronizací externích úlošišť</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="41"/> + <location filename="../src/gui/generalsettings.ui" line="55"/> <source>&Launch on System Startup</source> <translation>&Spustit při startu systému</translation> </message> @@ -1477,69 +1528,54 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <translation>Zobrazovat &upozornění na ploše</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="58"/> - <source>Use &Monochrome Icons</source> - <translation>Používat čer&nobílé ikony</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="213"/> - <source>Version</source> - <translation>Verze</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="240"/> + <location filename="../src/gui/generalsettings.ui" line="220"/> <source>&Update Channel</source> <translation>&Aktualizační kanál</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="346"/> - <source>•</source> - <translation>•</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="76"/> + <location filename="../src/gui/generalsettings.ui" line="102"/> <source>Edit &Ignored Files</source> <translation>Upravit &ignorované soubory</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="155"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Zobrazit synchronizované složky v postranní liště &Průzkumníka souborů</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="172"/> + <location filename="../src/gui/generalsettings.ui" line="93"/> <source>S&how crash reporter</source> <translation>Z&obrazit hlášení o pádech</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="289"/> + <location filename="../src/gui/generalsettings.ui" line="269"/> <source>&Restart && Update</source> <translation>&Restart && aktualizace</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="266"/> + <location filename="../src/gui/generalsettings.cpp" line="280"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="176"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>Change update channel?</source> <translation>Změnit aktualizační kanál?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="177"/> + <location filename="../src/gui/generalsettings.cpp" line="191"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="190"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Change update channel</source> <translation>Změnit aktualizační kanál</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="205"/> <source>Cancel</source> <translation>Zrušit</translation> </message> @@ -1576,63 +1612,53 @@ Note that this selects only what pool upgrades are taken from, and that there ar </message> <message> <location filename="../src/gui/ignorelisteditor.ui" line="20"/> - <source>Global Ignore Settings</source> - <translation>Globální nastavení pro ignorování</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.ui" line="26"/> - <source>Sync hidden files</source> - <translation>Synchronizovat skryté soubory</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.ui" line="36"/> <source>Files Ignored by Patterns</source> <translation>Ignorovat soubory podle masky</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="75"/> + <location filename="../src/gui/ignorelisteditor.ui" line="59"/> <source>Add</source> <translation>Přidat</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="57"/> + <location filename="../src/gui/ignorelisteditor.ui" line="41"/> <source>Pattern</source> <translation>Maska</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="62"/> + <location filename="../src/gui/ignorelisteditor.ui" line="46"/> <source>Allow Deletion</source> <translation>Povolit mazání</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="85"/> + <location filename="../src/gui/ignorelisteditor.ui" line="69"/> <source>Remove</source> <translation>Odebrat</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="121"/> + <location filename="../src/gui/ignorelisteditor.ui" line="105"/> <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"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="119"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="112"/> <source>Could not open file</source> <translation>Nepodařilo se otevřít soubor</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="120"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="113"/> <source>Cannot write changes to '%1'.</source> <translation>Nelze zapsat změny do '%1'.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="146"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="132"/> <source>Add Ignore Pattern</source> <translation>Přidat masku ignorovaných</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="147"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> <source>Add a new ignore pattern:</source> <translation>Přidat novou masku ignorovaných souborů:</translation> </message> @@ -1733,35 +1759,54 @@ Items where deletion is allowed will be deleted if they prevent a directory from <context> <name>OCC::LogBrowser</name> <message> - <location filename="../src/gui/logbrowser.cpp" line="46"/> + <location filename="../src/gui/logbrowser.ui" line="14"/> <source>Log Output</source> <translation>Zaznamenat výstup</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="52"/> + <location filename="../src/gui/logbrowser.ui" line="116"/> + <source>Enable logging to temporary folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="61"/> + <source>Delete logs older than %1 hours</source> + <translation>Smazat logy starší než %1 hodin</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="53"/> + <source><html><head/><body><p><span style=" font-weight:600; color:#ff0000;">The logs contain sensitive information which you should not make publicly available</span></p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="71"/> <source>The client can write debug logs to a temporary folder. These logs are very helpful for diagnosing problems. -Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space. -If enabled, logs will be written to %1</source> +Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="66"/> - <source>Enable logging to temporary folder</source> + <location filename="../src/gui/logbrowser.ui" line="84"/> + <source>If enabled, logs will be written to:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> - <source>Delete logs older than %1 hours</source> - <translation>Smazat logy starší než %1 hodin</translation> + <location filename="../src/gui/logbrowser.ui" line="91"/> + <source>C:/log</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="123"/> + <source>Log Http traffic </source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.ui" line="143"/> <source>These settings persist across client restarts. Note that using any logging command line options will override the settings.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="85"/> + <location filename="../src/gui/logbrowser.ui" line="154"/> <source>Open folder</source> <translation>Otevřít adresář</translation> </message> @@ -1769,12 +1814,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="186"/> + <location filename="../src/libsync/logger.cpp" line="177"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="187"/> + <location filename="../src/libsync/logger.cpp" line="178"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Soubor '%1'<br/>nelze otevřít pro zápis.<br/><br/>Výstup záznamu <b>nelze</b> uložit.</nobr></translation> </message> @@ -1949,23 +1994,23 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NotificationWidget</name> <message> - <location filename="../src/gui/notificationwidget.cpp" line="65"/> + <location filename="../src/gui/notificationwidget.cpp" line="59"/> <source>Created at %1</source> <translation>Vytvořen v %1</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="78"/> + <location filename="../src/gui/notificationwidget.cpp" line="72"/> <source>Closing in a few seconds...</source> <translation>Uzavření za několik sekund...</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="125"/> + <location filename="../src/gui/notificationwidget.cpp" line="119"/> <source>%1 request failed at %2</source> <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment> <translation>%1 požadavek selhal při %2</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="131"/> + <location filename="../src/gui/notificationwidget.cpp" line="125"/> <source>'%1' selected at %2</source> <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment> <translation>'%1' vybrán na %2</translation> @@ -1974,68 +2019,73 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> + <location filename="../src/libsync/creds/oauth.cpp" line="127"/> <source>Error returned from the server: <em>%1</em></source> <translation>Chybná odpověď serveru: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="130"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="134"/> <source>Empty JSON from OAuth2 redirect</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="139"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Není možné ověřit formát JSON souboru přijatého ze serveru: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="142"/> <source>Unsupported token type: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="151"/> + <location filename="../src/libsync/creds/oauth.cpp" line="144"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="153"/> + <location filename="../src/libsync/creds/oauth.cpp" line="146"/> <source>Unknown Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="291"/> + <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="157"/> + <location filename="../src/libsync/creds/oauth.cpp" line="150"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Chyba přihlášení</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="202"/> - <location filename="../src/libsync/creds/oauth.cpp" line="205"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="214"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="235"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation type="unfinished"/> </message> @@ -2103,58 +2153,58 @@ můžete být požádáni o dodatečná oprávnění.</translation> <context> <name>OCC::OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="50"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/> <source>Connect to %1</source> <translation>Připojit k %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="52"/> <source>Setup local folder options</source> <translation>Možnosti nastavení místního adresáře</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="60"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="61"/> <source>Connect...</source> <translation>Připojit...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="85"/> - <source>Use &virtual files instead of downloading content immediately %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="86"/> - <source>(tech preview)</source> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> + <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="86"/> - <source>(experimental)</source> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> + <source>Use &virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="178"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 adresář '%2' je synchronizován do místního adresáře '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <source>Sync the folder '%1'</source> <translation>Synchronizovat adresář '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="202"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Varování:</strong> Místní adresář není prázdný. Zvolte další postup!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="283"/> + <source>Virtual files are not available for the selected folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="343"/> <source>Local Sync Folder</source> <translation>Místní synchronizovaný adresář</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="350"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="377"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="412"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2231,39 +2281,39 @@ můžete být požádáni o dodatečná oprávnění.</translation> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> <source>Connect to %1</source> <translation>Připojit k %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> <source>Setup %1 server</source> <translation>Nastavit server %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="132"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation>Tato adresa NENÍ bezpečná, protože není šifrovaná. Nedoporučuje se jí používat.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="136"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> <source>This url is secure. You can use it.</source> <translation>URL je bezpečná. Můžete ji použít.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="175"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> <source>&Next ></source> <translation>&Následující ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> <source>Invalid URL</source> <translation>Neplatná URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Není možné načíst certifikát. Je zadáno správné heslo?</translation> </message> @@ -2271,144 +2321,144 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="251"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="226"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Úspěšně připojeno k %1: %2 verze %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Selhalo spojení s %1 v %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Vypršení časového limitu při pokusu o připojení k %1 na %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="291"/> <source>Trying to connect to %1 at %2...</source> <translation>Pokouším se připojit k %1 na %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>Ověřený požadavek na server byl přesměrován na '%1'. URL je špatně, server není správně nakonfigurován.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>Byla obdržena nesprávná odpověď na ověřený webdav požadavek</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Přístup zamítnut serverem. Pro ověření správných přístupových práv <a href="%1">klikněte sem</a> a otevřete službu ve svém prohlížeči.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/> <source>Invalid URL</source> <translation>Neplatná URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="434"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Místní synchronizovaný adresář %1 již existuje, nastavuji jej pro synchronizaci.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>Vytvářím místní adresář pro synchronizaci %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>OK</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="443"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>selhalo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>Nelze vytvořit místní adresář %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="471"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>Není nastaven žádný vzdálený adresář!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="477"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Chyba: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>vytvářím adresář na ownCloudu: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="506"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>Vzdálený adresář %1 byl úspěšně vytvořen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Vzdálený adresář %1 již existuje. Spojuji jej pro synchronizaci.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Vytvoření adresáře selhalo s HTTP chybou %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Vytvoření vzdáleného adresáře selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.<br/>Vraťte se prosím zpět a zkontrolujte je.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Vytvoření vzdáleného adresáře selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.</font><br/>Vraťte se prosím zpět a zkontrolujte je.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Vytváření vzdáleného adresáře %1 selhalo s chybou <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Bylo nastaveno synchronizované spojení z %1 do vzdáleného adresáře %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>Úspěšně spojeno s %1.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Spojení s %1 nelze navázat. Prosím zkuste to znovu.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="567"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Přejmenování adresáře selhalo</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="568"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Nelze odstranit a zazálohovat adresář, protože adresář nebo soubor v něm je otevřen v jiném programu. Prosím zavřete adresář nebo soubor a zkuste znovu nebo zrušte akci.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Místní synchronizovaný adresář %1 byl úspěšně vytvořen!</b></font></translation> </message> @@ -2416,44 +2466,22 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="78"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>%1 Průvodce spojením</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="251"/> - <source>Enable technical preview feature?</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/> - <source>When the "virtual files" 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.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="260"/> - <source>Enable virtual files</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/> - <source>Continue to use selective sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="266"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation>Povolit experimentální fukce?</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="280"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="271"/> <source>Enable experimental placeholder mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="267"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/> <source>When the "virtual files" mode is enabled no files will be downloaded initially. Instead, a tiny "%1" 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. @@ -2464,7 +2492,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="281"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation type="unfinished"/> </message> @@ -2593,12 +2621,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1246"/> + <location filename="../src/libsync/discovery.cpp" line="1244"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1259"/> + <location filename="../src/libsync/discovery.cpp" line="1257"/> <source>Not allowed to remove, restoring</source> <translation>Odstranění není povoleno, obnovuji</translation> </message> @@ -2618,17 +2646,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1223"/> + <location filename="../src/libsync/discovery.cpp" line="1222"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1368"/> + <location filename="../src/libsync/discovery.cpp" line="1367"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1428"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation type="unfinished"/> </message> @@ -2636,7 +2664,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1001"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1006"/> <source>Error writing metadata to the database</source> <translation>Chyba zápisu metadat do databáze</translation> </message> @@ -2706,22 +2734,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="147"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="146"/> <source>could not delete file %1, error: %2</source> <translation>smazání souboru %1 se nezdařilo, chyba: %2</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="162"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Pozor, možná kolize z důvodu velikosti písmen s %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="168"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> <source>could not create folder %1</source> <translation>nepodařilo se vytvořit adresář %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="179"/> <source>Error writing metadata to the database</source> <translation>Chyba zápisu metadat do databáze</translation> </message> @@ -2729,7 +2757,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="100"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Nelze odstranit %1 z důvodu kolize názvu se souborem v místním systému</translation> </message> @@ -2737,18 +2765,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="218"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Soubor %1 nemohl být přejmenován na %2 z důvodu kolize názvu se souborem v místním systému</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="249"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="255"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="248"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="254"/> <source>Error writing metadata to the database</source> <translation>Chyba zápisu metadat do databáze</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="261"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> <source>Error setting pin state</source> <translation type="unfinished"/> </message> @@ -2827,7 +2855,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/libsync/propagateupload.cpp" line="663"/> + <location filename="../src/libsync/propagateupload.cpp" line="677"/> <source>Error writing metadata to the database</source> <translation>Chyba zápisu metadat do databáze</translation> </message> @@ -2868,12 +2896,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileTUS</name> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="203"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>Místní soubor byl odstraněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>Místní soubor byl změněn během synchronizace.</translation> </message> @@ -3045,28 +3073,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SettingsDialog</name> <message> - <location filename="../src/gui/settingsdialog.cpp" line="117"/> + <location filename="../src/gui/settingsdialog.cpp" line="196"/> <source>Settings</source> <translation>Nastavení</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="108"/> + <location filename="../src/gui/settingsdialog.cpp" line="187"/> <source>Activity</source> <translation>Aktivita</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="128"/> - <location filename="../src/gui/settingsdialog.cpp" line="131"/> + <location filename="../src/gui/settingsdialog.cpp" line="176"/> + <source>Add account</source> + <translation>Přidat účet</translation> + </message> + <message> + <location filename="../src/gui/settingsdialog.cpp" line="207"/> + <location filename="../src/gui/settingsdialog.cpp" line="210"/> <source>Quit %1</source> <translation>Ukončit %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="132"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="254"/> + <location filename="../src/gui/settingsdialog.cpp" line="342"/> <source>Account</source> <translation>Účet</translation> </message> @@ -3104,42 +3137,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud cesta:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="108"/> + <location filename="../src/gui/sharedialog.cpp" line="110"/> <source>%1 Sharing</source> <translation>%1 sdílení</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="86"/> + <location filename="../src/gui/sharedialog.cpp" line="88"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="105"/> + <location filename="../src/gui/sharedialog.cpp" line="107"/> <source>Folder: %2</source> <translation>Adresář: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="111"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>The server does not allow sharing</source> <translation>Sdílení je na serveru zakázáno</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="127"/> + <location filename="../src/gui/sharedialog.cpp" line="129"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Přijímání nejvyšších možných oprávnění pro sdílení ze serveru...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="197"/> + <location filename="../src/gui/sharedialog.cpp" line="202"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Tento soubor nelze sdílet, protože byl nasdílen bez možnosti dalšího sdílení.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="211"/> + <location filename="../src/gui/sharedialog.cpp" line="216"/> <source>Users and Groups</source> <translation>Uživatelé a skupiny</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="218"/> + <location filename="../src/gui/sharedialog.cpp" line="223"/> <source>Public Links</source> <translation>Veřejné odkazy</translation> </message> @@ -3334,32 +3367,32 @@ 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/shareusergroupwidget.cpp" line="210"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> <source>The item is not shared with any users or groups</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="241"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> <source>Open link in browser</source> <translation>Otevřít odkaz v prohlížeči</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> <source>Copy link to clipboard</source> <translation>Zkopírovat URL do schránky</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> <source>Send link by email</source> <translation>Poslat odkaz emailem</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="255"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> <source>No results for '%1'</source> <translation>Žádné výsledky pro '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> <source>I shared something with you</source> <translation type="unfinished"/> </message> @@ -3393,17 +3426,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> <source>create</source> <translation>vytvořit</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> <source>change</source> <translation>změnit</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> <source>delete</source> <translation>smazat</translation> </message> @@ -3770,17 +3803,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Je dostupných pouze %1, pro spuštění je potřeba alespoň %2</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="482"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1035"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1042"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> @@ -3795,27 +3828,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="498"/> <source>Using virtual files with suffix, but suffix is not set</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="515"/> + <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>Unable to read the blacklist from the local database</source> <translation>Nelze načíst blacklist z místní databáze</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="546"/> + <location filename="../src/libsync/syncengine.cpp" line="541"/> <source>Unable to read from the sync journal.</source> <translation>Nelze číst ze žurnálu synchronizace.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="630"/> + <location filename="../src/libsync/syncengine.cpp" line="625"/> <source>Cannot open the sync journal</source> <translation>Nelze otevřít synchronizační žurnál</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1018"/> <source>Aborted</source> <translation>Zrušeno</translation> </message> @@ -3831,20 +3864,10 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="341"/> - <source><p>Version %2. For more information visit <a href="%3">https://%4</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Hannah von Reth, and others.</small></p></source> + <location filename="../src/libsync/theme.cpp" line="382"/> + <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/libsync/theme.cpp" line="348"/> - <source><p>Copyright ownCloud GmbH</p></source> - <translation><p>Copyright ownCloud GmbH</p></translation> - </message> - <message> - <location filename="../src/libsync/theme.cpp" line="349"/> - <source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source> - <translation><p>Šíří %1 pod licencí GNU General Public License (GPL) Verze 2.0.<br/>%2 a %2 logo jsou registrované známky %1 ve Spojených Státech, ostatních zemích, nebo obojí.</p></translation> - </message> </context> <context> <name>OCC::ValidateChecksumHeader</name> @@ -3865,245 +3888,252 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::Vfs</name> + <message> + <location filename="../src/common/vfs.cpp" line="72"/> + <source>The Virtual filesystem feature requires a NTFS file system, %1 is using %2</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="267"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Please sign in</source> <translation>Přihlašte se prosím</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="313"/> + <location filename="../src/gui/owncloudgui.cpp" line="304"/> <source>Folder %1: %2</source> <translation>Adresář %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Nejsou nastaveny žádné adresáře pro synchronizaci.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="340"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Otevřít v prohlížeči</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="389"/> - <location filename="../src/gui/owncloudgui.cpp" line="712"/> - <location filename="../src/gui/owncloudgui.cpp" line="806"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Log in...</source> <translation>Přihlásit...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="393"/> - <location filename="../src/gui/owncloudgui.cpp" line="704"/> - <location filename="../src/gui/owncloudgui.cpp" line="808"/> + <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Log out</source> <translation>Odhlásit se</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="499"/> + <location filename="../src/gui/owncloudgui.cpp" line="490"/> <source>Recent Changes</source> <translation>Poslední změny</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="358"/> <source>Managed Folders:</source> <translation>Spravované adresáře:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="361"/> <source>Open folder '%1'</source> <translation>Otevřít adresář '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="342"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Otevřít %1 v prohlížeči</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="190"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="789"/> + <location filename="../src/gui/owncloudgui.cpp" line="780"/> <source>Unknown status</source> <translation>Neznámý stav</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Settings...</source> <translation>Nastavení...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>Details...</source> <translation>Podrobnosti...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="799"/> + <location filename="../src/gui/owncloudgui.cpp" line="790"/> <source>Help</source> <translation>Nápověda</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="803"/> + <location filename="../src/gui/owncloudgui.cpp" line="794"/> <source>Quit %1</source> <translation>Ukončit %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="248"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Disconnected from %1</source> <translation>Odpojeno od %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="198"/> + <location filename="../src/gui/owncloudgui.cpp" line="189"/> <source>Unsupported Server Version</source> <translation>Nepodporovaná verze serveru</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="238"/> + <location filename="../src/gui/owncloudgui.cpp" line="229"/> <source>Disconnected</source> <translation>Odpojeno</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="240"/> + <location filename="../src/gui/owncloudgui.cpp" line="231"/> <source>Disconnected from some accounts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from accounts:</source> <translation>Odpojeno od účtů:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="253"/> + <location filename="../src/gui/owncloudgui.cpp" line="244"/> <source>Account %1: %2</source> <translation>Účet %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> <source>Signed out</source> <translation>Odhlášeno</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="272"/> + <location filename="../src/gui/owncloudgui.cpp" line="263"/> <source>Account synchronization is disabled</source> <translation>Synchronizace účtu je vypnuta</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="264"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>Synchronizace je pozastavena</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="321"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>Unresolved conflicts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="328"/> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Chyba při synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="378"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Unpause all folders</source> <translation>Spustit všechny adresáře</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="383"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> <source>Pause all folders</source> <translation>Pozastavit všechny adresáře</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="683"/> + <location filename="../src/gui/owncloudgui.cpp" line="674"/> <source>Unpause all synchronization</source> <translation>Spustit veškerou synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="685"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause synchronization</source> <translation>Spustit synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="693"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Pause all synchronization</source> <translation>Pozastavit veškerou synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause synchronization</source> <translation>Pozastavit synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="702"/> + <location filename="../src/gui/owncloudgui.cpp" line="693"/> <source>Log out of all accounts</source> <translation>Odhlásit ze všech účtů</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="710"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> <source>Log in to all accounts...</source> <translation>Přihlásit ke všem účtům...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>New account...</source> <translation>Nový účet...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="801"/> - <location filename="../src/gui/owncloudgui.cpp" line="1151"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>About %1</source> <translation>O %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="834"/> + <location filename="../src/gui/owncloudgui.cpp" line="825"/> <source>No items synced recently</source> <translation>Žádné položky nebyly nedávno synchronizovány</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="856"/> + <location filename="../src/gui/owncloudgui.cpp" line="847"/> <source>Checking for changes in remote '%1'</source> <translation>Zjišťuji změny ve vzdáleném '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in local '%1'</source> <translation>Zjišťuji změny v místním '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="874"/> + <location filename="../src/gui/owncloudgui.cpp" line="865"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Synchronizuji %1 ze %2 (zbývá %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="879"/> + <location filename="../src/gui/owncloudgui.cpp" line="870"/> <source>Syncing %1 of %2</source> <translation>Synchronizace %1 z %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="888"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 (%2 left)</source> <translation>Synchronizuji %1 (zbývá %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="891"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1</source> <translation>Synchronizuji %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="909"/> + <location filename="../src/gui/owncloudgui.cpp" line="899"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> <source>Up to date</source> <translation>Aktuální</translation> </message> @@ -4117,84 +4147,82 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="52"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="108"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="207"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="316"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="490"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="501"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="135"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="234"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="553"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="564"/> <source>TextLabel</source> <translation>Textový štítek</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="62"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="86"/> <source>Server</source> <translation>Server</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="414"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="477"/> <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source> <translation><html><head/><body><p>Pokud je tato volba zaškrtnuta, aktuální obsah v místním adresáři bude smazán a bude zahájena nová synchronizace ze serveru.</p><p>Nezaškrtávejte pokud má být místní obsah nahrán do adresářů na serveru.</p></body></html></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="417"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="480"/> <source>Start a &clean sync (Erases the local folder!)</source> <translation>Spustit novou synchroniza&ci (Smaže lokální data!)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="165"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="192"/> <source>Ask for confirmation before synchroni&zing folders larger than</source> <translation>Zeptat se na synchroni&zaci složek větších než</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="182"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="209"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="191"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="218"/> <source>Ask for confirmation before synchronizing e&xternal storages</source> <translation>Zeptat se na potvrzení před synchronizací e&xterních úložišť</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="227"/> <source>Choose what to sync</source> <translation>Vybrat co sesynchronizovat</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="245"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="248"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="272"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="275"/> <source><html><head/><body><p>When this option is selected, the wizard will close without synchronizing anything. You can use the &quot;Add Folder Sync Connection&quot; button from the account settings to choose which pair of local and remote folder you wish to synchronize</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="251"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/> <source>Manually create folder sync connections </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="332"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> <source>&Local Folder</source> <translation>Místní s&ložka</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="373"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="436"/> <source>pbSelectLocalFolder</source> <translation>pbSelectLocalFolder</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="404"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="467"/> <source>&Keep local data</source> <translation>&Ponechat místní data</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="125"/> <source>S&ynchronize everything from server (recommended)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="435"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="498"/> <source>Status message</source> <translation>Stavová zpráva</translation> </message> @@ -4249,7 +4277,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="196"/> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> <source>TextLabel</source> <translation>Textový popisek</translation> </message> @@ -4264,7 +4292,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="160"/> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> <source>Error Label</source> <translation>Popis chyby</translation> </message> @@ -4296,37 +4324,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>V budoucnosti</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>před %n dnem</numerusform><numerusform>před %n dny</numerusform><numerusform>před %n dny</numerusform><numerusform>před %n dny</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>před %n hodinou</numerusform><numerusform>před %n hodinami</numerusform><numerusform>před %n hodinami</numerusform><numerusform>před %n hodinami</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>nyní</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>Méně než před minutou</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>před %n minutou</numerusform><numerusform>před %n minutami</numerusform><numerusform>před %n minutami</numerusform><numerusform>před %n minutami</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>Před nějakým časem</translation> </message> @@ -4409,11 +4437,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>ownCloudTheme::about()</name> + <name>ownCloudTheme::aboutVersions()</name> + <message> + <location filename="../src/libsync/theme.cpp" line="360"/> + <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="320"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> - <translation><p><small>Sestaveno na Git revizi <a href="%1">%2</a> na %3, %4 s použitím Qt %5, %6</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="350"/> + <source>%1 (Built against Qt %1)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ownCloudTheme::versionWithSha</name> + <message> + <location filename="../src/libsync/theme.cpp" line="355"/> + <source>%1 %2</source> + <translation>%1 %2</translation> </message> </context> <context> @@ -4519,52 +4563,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Nedefinovaný stav</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>Čekám na zahájení synchronizace</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>Synchronizace běží</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Synchronizace úspěšná</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>Synchronizace úspěšná, některé soubory byly ignorovány.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Chyba synchronizace</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Chyba nastavení</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>Připravuji na synchronizaci</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>Ruším...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>Synchronizace pozastavena</translation> </message> @@ -4572,53 +4616,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>utility</name> <message> - <location filename="../src/gui/guiutility.cpp" line="38"/> + <location filename="../src/gui/guiutility.cpp" line="39"/> <source>Could not open browser</source> <translation>Nemohu otevřít prohlížeč</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="39"/> + <location filename="../src/gui/guiutility.cpp" line="40"/> <source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="62"/> + <location filename="../src/gui/guiutility.cpp" line="63"/> <source>Could not open email client</source> <translation>Nelze otevřít poštovního klienta</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="63"/> + <location filename="../src/gui/guiutility.cpp" line="64"/> <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source> <translation>Došlo k chybě při otevírání nové zprávy v emailovém klientu. Možná nebyl nastaven výchozí emailový klient?</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="78"/> + <location filename="../src/gui/guiutility.cpp" line="79"/> <source>Always available locally</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="82"/> + <location filename="../src/gui/guiutility.cpp" line="83"/> <source>Some available online only</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="84"/> - <location filename="../src/gui/guiutility.cpp" line="86"/> + <location filename="../src/gui/guiutility.cpp" line="85"/> + <location filename="../src/gui/guiutility.cpp" line="87"/> <source>Available online only</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="80"/> + <location filename="../src/gui/guiutility.cpp" line="81"/> <source>Currently available locally</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="93"/> + <location filename="../src/gui/guiutility.cpp" line="94"/> <source>Make always available locally</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="98"/> + <location filename="../src/gui/guiutility.cpp" line="99"/> <source>Free up local space</source> <translation>Uvolnit místo na místním disku</translation> </message> diff --git a/translations/client_de.ts b/translations/client_de.ts index aad2c0762..2769bde03 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -87,22 +87,45 @@ <translation>Formular</translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="58"/> + <location filename="../src/gui/notificationwidget.ui" line="73"/> <source>Lorem ipsum dolor sit amet</source> <translation>Lorem ipsum dolor sit amet</translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="71"/> + <location filename="../src/gui/notificationwidget.ui" line="86"/> <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source> <translation>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="91"/> + <location filename="../src/gui/notificationwidget.ui" line="106"/> <source>TextLabel</source> <translation>Text Label</translation> </message> </context> <context> + <name>OCC::AboutDialog</name> + <message> + <location filename="../src/gui/aboutdialog.ui" line="24"/> + <source>About</source> + <translation>Über</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.ui" line="88"/> + <source>TextLabel</source> + <translation>Text Label</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.ui" line="96"/> + <source>Versions</source> + <translation>Versionen</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.cpp" line="28"/> + <source>About %1</source> + <translation>Über %1</translation> + </message> +</context> +<context> <name>OCC::AbstractNetworkJob</name> <message> <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> @@ -121,6 +144,14 @@ </message> </context> <context> + <name>OCC::Account</name> + <message> + <location filename="../src/libsync/account.cpp" line="121"/> + <source>%1@%2</source> + <translation>%1@%2</translation> + </message> +</context> +<context> <name>OCC::AccountSettings</name> <message> <location filename="../src/gui/accountsettings.ui" line="14"/> @@ -130,7 +161,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser </source> - <translation type="unfinished"/> + <translation>Browser erneut öffnen</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -169,9 +200,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="512"/> - <location filename="../src/gui/accountsettings.cpp" line="625"/> - <location filename="../src/gui/accountsettings.cpp" line="1083"/> + <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="611"/> + <location filename="../src/gui/accountsettings.cpp" line="1048"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> @@ -181,87 +212,67 @@ <translation>Verbunden mit <server> als <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="180"/> <source>No account configured.</source> <translation>Kein Konto konfiguriert.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="200"/> - <source>Add new</source> - <translation>Neues Konto hinzufügen</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="209"/> + <location filename="../src/gui/accountsettings.cpp" line="203"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="213"/> + <location filename="../src/gui/accountsettings.cpp" line="207"/> <source>Account</source> <translation>Benutzerkonto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="297"/> <source>Choose what to sync</source> <translation>Zu synchronisierende Elemente auswählen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Force sync now</source> <translation>Synchronisation jetzt erzwingen </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="305"/> <source>Restart sync</source> <translation>Synchronisation neustarten</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="327"/> + <location filename="../src/gui/accountsettings.cpp" line="314"/> <source>Remove folder sync connection</source> <translation>Ordner-Synchronisation entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>Enable virtual file support %1...</source> - <translation>Unterstützung für virtuelle Dateien einschalten %1...</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>(tech preview)</source> - <translation>(Tech-Vorschau)</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>(experimental)</source> - <translation>(Experimentell)</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="445"/> + <location filename="../src/gui/accountsettings.cpp" line="433"/> <source>Folder creation failed</source> <translation>Anlegen des Ordners fehlgeschlagen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="434"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Konnte lokalen Ordner <i>%1</i> nicht anlegen.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="504"/> + <location filename="../src/gui/accountsettings.cpp" line="491"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Bestätigen Sie die Löschung der Ordner-Synchronisation</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="511"/> + <location filename="../src/gui/accountsettings.cpp" line="499"/> <source>Remove Folder Sync Connection</source> <translation>Ordner-Synchronisation entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="616"/> + <location filename="../src/gui/accountsettings.cpp" line="602"/> <source>Disable virtual file support?</source> <translation>Deaktiviere Unterstützung für virtuelle Dateien?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="617"/> + <location filename="../src/gui/accountsettings.cpp" line="603"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -274,173 +285,183 @@ Der einzige Vorteil durch das Abschalten der Unterstützung für virtuelle Datei Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="624"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Disable support</source> <translation>Unterstützung abschalten</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="734"/> + <location filename="../src/gui/accountsettings.cpp" line="712"/> <source>Sync Running</source> <translation>Synchronisation läuft</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="735"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Die Synchronisation läuft gerade.<br/>Wollen Sie sie beenden?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="830"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>%1 in use</source> <translation>%1 wird verwendet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="857"/> + <location filename="../src/gui/accountsettings.cpp" line="836"/> <source>%1 as <i>%2</i></source> <translation>%1 als <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="845"/> <source>Connected to %1.</source> <translation>Verbunden mit %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="871"/> + <location filename="../src/gui/accountsettings.cpp" line="850"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 ist derzeit nicht verfügbar.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="874"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Server %1 befindet sich im Wartungsmodus.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="877"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Signed out from %1.</source> <translation>Abgemeldet von %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="887"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Connecting to %1...</source> <translation>Verbinde mit %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="871"/> <source>No connection to %1 at %2.</source> <translation>Keine Verbindung zu %1 auf %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="910"/> <source>Log in</source> <translation>Einloggen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1026"/> + <location filename="../src/gui/accountsettings.cpp" line="1005"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Einige Verzeichnisse konnten nicht synchronisiert werden, da sie zu groß sind:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1028"/> + <location filename="../src/gui/accountsettings.cpp" line="1007"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da diese externe Speicher sind:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1029"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da diese zu groß oder externe Speicher sind:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1075"/> + <location filename="../src/gui/accountsettings.cpp" line="1041"/> <source>Confirm Account Removal</source> <translation>Konto wirklich entfernen?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1076"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Wollen Sie wirklich die Verbindung zum Konto <i>%1</i> lösen?</p><p><b>Anmerkung:</b> Dieser Vorgang wird <b>keine</b> Dateien löschen.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1082"/> + <location filename="../src/gui/accountsettings.cpp" line="1047"/> <source>Remove connection</source> <translation>Verbindung entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="306"/> + <location filename="../src/gui/accountsettings.cpp" line="293"/> <source>Open folder</source> <translation>Ordner öffnen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="205"/> - <location filename="../src/gui/accountsettings.cpp" line="933"/> + <location filename="../src/gui/accountsettings.cpp" line="199"/> + <location filename="../src/gui/accountsettings.cpp" line="912"/> <source>Log out</source> <translation>Abmelden</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="265"/> + <location filename="../src/gui/accountsettings.cpp" line="252"/> <source>Open local folder</source> <translation>Öffne lokalen Ordner</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="273"/> + <location filename="../src/gui/accountsettings.cpp" line="260"/> <source>Open folder in browser</source> <translation>Ordner im Browser öffnen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="324"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Resume sync</source> <translation>Synchronisation fortsetzen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="324"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Pause sync</source> <translation>Synchronisation pausieren</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="331"/> + <location filename="../src/gui/accountsettings.cpp" line="318"/> <source>Availability</source> <translation>Verfügbarkeit</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="348"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source>Disable virtual file support...</source> <translation>Deaktiviere Unterstützung für virtuelle Dateien ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="505"/> + <location filename="../src/gui/accountsettings.cpp" line="343"/> + <source>Enable virtual file support%1...</source> + <translation>Unterstützung für virtuelle Dateien einschalten %1...</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="343"/> + <source> (experimental)</source> + <translation>(Experimentell)</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="492"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Möchten Sie den Ordner <i>%1</i> wirklich nicht mehr synchronisieren?</p><p><b>Anmerkung:</b> Dies wird <b>keine</b> Dateien löschen.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="817"/> + <location filename="../src/gui/accountsettings.cpp" line="796"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) von %2 Serverkapazität verwendet. Einige Ordner, einschließlich über das Netzwerk verbundene oder freigegebene Ordner oder geteilte Ordner können unterschiedliche Beschränkungen aufweisen. </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="818"/> + <location filename="../src/gui/accountsettings.cpp" line="797"/> <source>%1 of %2 in use</source> <translation>%1 von %2 Serverkapazität verwendet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="827"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Currently there is no storage usage information available.</source> <translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="864"/> + <location filename="../src/gui/accountsettings.cpp" line="843"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>Die Serverversion %1 ist nicht unterstützt! Fortfahren auf eigenes Risiko.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="884"/> + <location filename="../src/gui/accountsettings.cpp" line="863"/> <source>Obtaining authorization from the browser.</source> - <translation type="unfinished"/> + <translation>Berechtigung vom Browser einholen.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="897"/> + <location filename="../src/gui/accountsettings.cpp" line="876"/> <source>Server configuration error: %1 at %2.</source> - <translation type="unfinished"/> + <translation>Konfigurationsfehler im Server: %1 auf %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="908"/> + <location filename="../src/gui/accountsettings.cpp" line="887"/> <source>No %1 connection configured.</source> <translation>Keine %1-Verbindung konfiguriert.</translation> </message> @@ -496,12 +517,12 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 auf %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 auf %2 (nicht verbunden)</translation> </message> @@ -517,44 +538,44 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="515"/> - <location filename="../src/gui/activitywidget.cpp" line="563"/> + <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="570"/> <source>Server Activity</source> <translation>Serveraktivität</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Synchronisationsprotokoll</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>nicht synchronisiert</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="574"/> + <location filename="../src/gui/activitywidget.cpp" line="581"/> <source>Not Synced (%1)</source> <extracomment>%1 is the number of not synced files.</extracomment> <translation>nicht synchronisiert (%1)</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="606"/> + <location filename="../src/gui/activitywidget.cpp" line="613"/> <source>The server activity list has been copied to the clipboard.</source> <translation>Die Server-Aktivitätsliste wurde in die Zwischenablage kopiert. </translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="610"/> + <location filename="../src/gui/activitywidget.cpp" line="617"/> <source>The sync activity list has been copied to the clipboard.</source> <translation>Die Synchronisationsliste wurde in die Zwischenablage kopiert.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="613"/> + <location filename="../src/gui/activitywidget.cpp" line="620"/> <source>The list of unsynced items has been copied to the clipboard.</source> <translation>Die Liste der unsynchronisierten Dateien wurde in die Zwischenablage kopiert.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="618"/> + <location filename="../src/gui/activitywidget.cpp" line="625"/> <source>Copied to clipboard</source> <translation>In die Zwischenablage kopiert</translation> </message> @@ -574,47 +595,47 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Server Aktivitäten</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Kopieren</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="93"/> + <location filename="../src/gui/activitywidget.cpp" line="100"/> <source>Copy the activity list to the clipboard.</source> <translation>Aktivitätsliste in die Zwischenablage kopieren.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Benachrichtigungen</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="351"/> + <location filename="../src/gui/activitywidget.cpp" line="358"/> <source>%n notifications(s) for %1.</source> <translation><numerusform>%n Benachrichtigung für %1.</numerusform><numerusform>%n Benachrichtigungen für %1.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="357"/> + <location filename="../src/gui/activitywidget.cpp" line="364"/> <source>%n notifications(s) for %1 and %2.</source> <translation><numerusform>%n Benachrichtigung für %1 und %2.</numerusform><numerusform>%n Benachrichtigungen für %1 und %2.</numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="359"/> + <location filename="../src/gui/activitywidget.cpp" line="366"/> <source>New notifications for %1, %2 and other accounts.</source> <translation>Neue Benachrichtigungen für %1, %2 und andere Konten.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="362"/> + <location filename="../src/gui/activitywidget.cpp" line="369"/> <source>Open the activity view for details.</source> <translation>Öffne die Aktivitäts-Ansicht für Genaueres.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="145"/> + <location filename="../src/gui/activitywidget.cpp" line="152"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Für Konto %1 sind serverseitig keine Aktivitäten aktiviert.</translation> </message> @@ -665,42 +686,42 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="134"/> + <location filename="../src/gui/application.cpp" line="136"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Fortsetzen bedeutet <b>dass diese Einstellungen gelöscht werden</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="138"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Fortsetzen bedeutet <b>dass diese Einstellungen ignoriert werden</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="142"/> + <location filename="../src/gui/application.cpp" line="144"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>Einige Einstellungen wurden in neueren Versionen dieses Programms eingestellt und nutzen Funktionen die in dieser Version nicht verfügbar sind. <br><br>%1<br><br> Die aktuelle Konfigurations-Datei wurde bereits an folgenden Ort gesichert: <i>%2</i></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="149"/> + <location filename="../src/gui/application.cpp" line="151"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="150"/> + <location filename="../src/gui/application.cpp" line="152"/> <source>Continue</source> <translation>Fortsetzen</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="299"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Error accessing the configuration file</source> <translation>Fehler beim Zugriff auf die Konfigurationsdatei</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="300"/> + <location filename="../src/gui/application.cpp" line="310"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Es ist ein Fehler beim Zugriff auf die Konfigurationsdatei unter %1 aufgetreten.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="303"/> + <location filename="../src/gui/application.cpp" line="313"/> <source>Quit ownCloud</source> <translation>ownCloud verlassen</translation> </message> @@ -731,7 +752,7 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1135"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1140"/> <source>Error writing metadata to the database</source> <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> </message> @@ -809,135 +830,135 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="172"/> + <location filename="../src/gui/folder.cpp" line="173"/> <source>Local folder %1 does not exist.</source> <translation>Lokales Verzeichnis %1 existiert nicht.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="175"/> + <location filename="../src/gui/folder.cpp" line="176"/> <source>%1 should be a folder but is not.</source> <translation>%1 sollte ein Ordner sein, ist es aber nicht.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="178"/> + <location filename="../src/gui/folder.cpp" line="179"/> <source>%1 is not readable.</source> <translation>%1 ist nicht lesbar.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 wurde gelöscht.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 wurde aktualisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 wurde in %2 umbenannt.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2.</source> <translation>%1 wurde in %2 verschoben.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="414"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 und %n andere Datei wurde gelöscht.</numerusform><numerusform>%1 und %n andere Dateien wurden gelöscht.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="420"/> + <location filename="../src/gui/folder.cpp" line="421"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 und %n andere Datei(en) wurden hinzugefügt.</numerusform><numerusform>%1 und %n andere Datei(en) wurden hinzugefügt.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 wurde hinzugefügt.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="427"/> + <location filename="../src/gui/folder.cpp" line="428"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 und %n andere Datei wurde aktualisiert.</numerusform><numerusform>%1 und %n andere Dateien wurden aktualisiert.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="434"/> + <location filename="../src/gui/folder.cpp" line="435"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 wurde in %2 umbenannt und %n andere Datei wurde umbenannt.</numerusform><numerusform>%1 wurde in %2 umbenannt und %n andere Dateien wurden umbenannt.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="441"/> + <location filename="../src/gui/folder.cpp" line="442"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 wurde in %2 verschoben und %n andere Datei wurde verschoben.</numerusform><numerusform>%1 wurde in %2 verschoben und %n andere Dateien wurden verschoben.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="448"/> + <location filename="../src/gui/folder.cpp" line="449"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 und %n andere Datei haben Konflikte beim Abgleichen.</numerusform><numerusform>%1 und %n andere Dateien haben Konflikte beim Abgleichen.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>Es gab einen Konflikt bei der Synchronisierung von %1. Bitte prüfen Sie die Konfliktdatei!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="455"/> + <location filename="../src/gui/folder.cpp" line="456"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 und %n weitere Datei konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform><numerusform>%1 und %n weitere Dateien konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 konnte aufgrund eines Fehlers nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="463"/> + <location filename="../src/gui/folder.cpp" line="464"/> <source>Sync Activity</source> <translation>Synchronisierungsaktivität</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="800"/> <source>Could not read system exclude file</source> <translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1045"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Ein neues Verzeichnis größer als %1 MB wurde hinzugefügt: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>A folder from an external storage has been added. </source> <translation>Ein Verzeichnis, von einem externen Speicher wurde hinzugefügt. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1049"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Bitte wechseln Sie zu den Einstellungen, falls Sie das Verzeichnis herunterladen möchten.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1109"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Der Ordner %1 wurde erzeugt aber früher von der Synchronisation ausgeschlossen. Daten im Ordner werden nicht synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1112"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Die Datei %1 wurde erzeugt aber früher von der Synchronisation ausgeschlossen. Sie wird nicht synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <source>Changes in synchronized folders could not be tracked reliably. This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default). @@ -950,7 +971,7 @@ Dies bedeutet, dass der Synchronisationsclient lokale Änderungen möglicherweis %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1208"/> + <location filename="../src/gui/folder.cpp" line="1197"/> <source>All files in the sync folder '%1' folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to keep the files, they will be re-synced with the server if you have rights to do so. @@ -961,7 +982,7 @@ Wenn Sie sich dazu entscheiden, diese Dateien zu behalten, werden diese wieder z Wenn Sie sich zum Löschen der Dateien entscheiden, sind diese nicht mehr verfügbar, außer Sie sind der Eigentümer.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1202"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -970,17 +991,17 @@ Sind Sie sich sicher, dass Sie diese Aktion mit Ihrem Server synchronisieren mö Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheiden, werden diese wieder vom Server synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1217"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>Alle Dateien löschen?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Lösche alle Dateien</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Dateien behalten</translation> </message> @@ -988,107 +1009,107 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="357"/> <source>Could not reset folder state</source> <translation>Konnte Ordner-Zustand nicht zurücksetzen</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="356"/> + <location filename="../src/gui/folderman.cpp" line="358"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Ein altes Synchronisations-Journal '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation>(Sicherung)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation>(Sicherung %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Undefined State.</source> <translation>Undefinierter Zustand.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1332"/> <source>Waiting to start syncing.</source> <translation>Wartet auf Beginn der Synchronisation</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>Preparing for sync.</source> <translation>Synchronisation wird vorbereitet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1336"/> + <location filename="../src/gui/folderman.cpp" line="1338"/> <source>Sync is running.</source> <translation>Synchronisation läuft.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronisation war erfolgreich, ungelöste Konflikte. </translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1343"/> + <location filename="../src/gui/folderman.cpp" line="1345"/> <source>Last Sync was successful.</source> <translation>Die letzte Synchronisation war erfolgreich.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>Installationsfehler.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>Benutzer-Abbruch</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>Sync is paused.</source> <translation>Synchronisation wurde angehalten.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1361"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisation ist pausiert)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1369"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <source>No valid folder selected!</source> <translation>Kein gültiger Ordner gewählt!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path does not exist!</source> <translation>Der gewählte Pfad existiert nicht!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1382"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>The selected path is not a folder!</source> <translation>Der gewählte Pfad ist kein Ordner!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1391"/> <source>You have no permission to write to the selected folder!</source> <translation>Sie haben keine Schreibberechtigung für den ausgewählten Ordner!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1456"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Es existiert bereits eine Synchronisation vom Server zu diesem lokalen Ordner. Bitte wählen Sie ein anderes lokales Verzeichnis!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1436"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>Der lokale Ordner %1 liegt innerhalb eines synchronisierten Ordners. Bitte wählen Sie einen anderen aus!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1442"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>Der lokale Ordner %1 liegt in einem Ordner, der bereits synchronisiert wird. Bitte wählen Sie einen anderen aus!</translation> </message> @@ -1096,16 +1117,11 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <context> <name>OCC::FolderStatusDelegate</name> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="47"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="46"/> <source>Add Folder Sync Connection</source> <translation>Ordner-Synchronisation hinzufügen</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="248"/> - <source>Synchronizing with local folder</source> - <translation>Synchronisiere mit lokalem Verzeichnis</translation> - </message> - <message> <location filename="../src/gui/folderstatusdelegate.cpp" line="299"/> <source>File</source> <translation>Datei</translation> @@ -1156,107 +1172,117 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <translation>Es existieren ungelöste Konflikte. Für Details klicken.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="897"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <source>Synchronizing VirtualFiles with local folder</source> + <translation>Synchronisiere virtuelle Dateien mit lokalem Verzeichnis</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <source>Synchronizing with local folder</source> + <translation>Synchronisiere mit lokalem Verzeichnis</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in remote '%1'</source> <translation>Änderungen der entfernten Ressource '%1' werden geprüft</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="901"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> <source>Checking for changes in local '%1'</source> <translation>Änderungen der lokalen Ressource '%1' werden geprüft</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="908"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> <source>Reconciling changes</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="943"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="946"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronisiere %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>Download %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="986"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>Upload %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 von %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1015"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 übrig, %1 von %2, Datei %3 von %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1023"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 of %2, Datei %3 von %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1030"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> <source>file %1 of %2</source> <translation>Datei %1 von %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> <source>Waiting...</source> <translation>Warte...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Warte auf einen anderen Ordner</numerusform><numerusform>Warte auf %n andere Ordner</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> <source>Preparing to sync...</source> <translation>Bereite Synchronisation vor...</translation> </message> @@ -1280,12 +1306,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="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Folder Sync Connection</source> <translation>Ordner-Synchronisation hinzufügen</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="576"/> + <location filename="../src/gui/folderwizard.cpp" line="578"/> <source>Add Sync Connection</source> <translation>Synchronisation hinzufügen</translation> </message> @@ -1293,17 +1319,17 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="68"/> + <location filename="../src/gui/folderwizard.cpp" line="69"/> <source>Click to select a local folder to sync.</source> <translation>Zur Auswahl eines lokalen Verzeichnisses für die Synchronisation klicken.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="75"/> + <location filename="../src/gui/folderwizard.cpp" line="76"/> <source>Enter the path to the local folder.</source> <translation>Pfad zum lokalen Verzeichnis eingeben</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="136"/> + <location filename="../src/gui/folderwizard.cpp" line="137"/> <source>Select the source folder</source> <translation>Den Quellordner wählen</translation> </message> @@ -1311,52 +1337,52 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="184"/> + <location filename="../src/gui/folderwizard.cpp" line="185"/> <source>Create Remote Folder</source> <translation>Entfernten Ordner erstellen</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="185"/> + <location filename="../src/gui/folderwizard.cpp" line="186"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Geben Sie den Namen des neuen, unter '%1' zu erstellenden Ordners ein: </translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="215"/> + <location filename="../src/gui/folderwizard.cpp" line="216"/> <source>Folder was successfully created on %1.</source> <translation>Order erfolgreich auf %1 erstellt.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="226"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Authentication failed accessing %1</source> <translation>Die Authentifizierung ist beim Zugriff auf %1 fehlgeschlagen</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="228"/> + <location filename="../src/gui/folderwizard.cpp" line="229"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Die Erstellung des Ordners auf %1 ist fehlgeschlagen. Bitte prüfen Sie dies manuell.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="247"/> <source>Failed to list a folder. Error: %1</source> <translation>Konnte Ordner nicht listen. Fehler: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="328"/> <source>Choose this to sync the entire account</source> <translation>Wählen Sie dies, um das gesamte Konto zu synchronisieren</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="440"/> <source>This folder is already being synced.</source> <translation>Dieser Ordner wird bereits synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="442"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Sie synchronisieren bereits <i>%1</i>, das ein übergeordneten Ordner von <i>%2</i> ist.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="444"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Sie synchronisieren bereits <i>%1</i>, das ein untergeordneter Ordner von <i>%2</i> ist.</translation> </message> @@ -1364,30 +1390,30 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> - <source>Use virtual files instead of downloading content immediately %1</source> - <translation>Virtuelle Dateien verwenden, anstatt die Dateien herunter zu laden %1</translation> + <location filename="../src/gui/folderwizard.cpp" line="485"/> + <source>Use virtual files instead of downloading content immediately%1</source> + <translation>Virtuelle Dateien verwenden, anstatt die Dateien herunter zu laden%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="489"/> - <source>(tech preview)</source> - <translation>(Tech-Vorschau)</translation> + <location filename="../src/gui/folderwizard.cpp" line="485"/> + <source> (experimental)</source> + <translation>(Experimentell)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="489"/> - <source>(experimental)</source> - <translation>(Experimentell)</translation> + <location filename="../src/gui/folderwizard.cpp" line="519"/> + <source>Virtual files are not available for the selected folder</source> + <translation>Virtuelle Dateien sind für den ausgewählten Ordner nicht verfügbar</translation> </message> </context> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="49"/> + <location filename="../src/gui/folderwizard.cpp" line="50"/> <source><b>Warning:</b> %1</source> <translation><b>Warnung:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="51"/> + <location filename="../src/gui/folderwizard.cpp" line="52"/> <source><b>Warning:</b></source> <translation><b>Warnung:</b></translation> </message> @@ -1436,48 +1462,73 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <translation>Allgemeine Einstellungen</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="55"/> - <source>For System Tray</source> - <translation>Für das Systembenachrichtungsfeld</translation> + <location filename="../src/gui/generalsettings.ui" line="80"/> + <source>Sync hidden files</source> + <translation>Synchronisiere versteckte Dateien</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="109"/> + <source>Log Settings</source> + <translation>Einstellungen für Logging</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="136"/> + <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> + <translation>Erweitert - Synchronisierung von Ordner genehmigen (Ausschliesslich im nicht-virtuellen Dateien Modus)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="184"/> + <location filename="../src/gui/generalsettings.ui" line="196"/> <source>Network</source> <translation>Netzwerk</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="257"/> + <location filename="../src/gui/generalsettings.ui" line="208"/> + <source>Updates</source> + <translation>Aktualisierungen</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="237"/> <source>stable</source> <translation>Stabil</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="262"/> + <location filename="../src/gui/generalsettings.ui" line="242"/> <source>beta</source> <translation>Beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="68"/> + <location filename="../src/gui/generalsettings.ui" line="337"/> + <source>About</source> + <translation>Über</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="65"/> <source>Advanced</source> <translation>Erweitert</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="100"/> + <location filename="../src/gui/generalsettings.ui" line="41"/> + <source>Use &Monochrome Icons in the system tray</source> + <translation>&Einfarbige Icons in der Taskleiste verwenden</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="144"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Nachfragen, bei Synchronisation von Ordnern grösser als</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="120"/> + <location filename="../src/gui/generalsettings.ui" line="164"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="186"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Bestätigung erfragen, bevor externe Speicher synchronisiert werden</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="41"/> + <location filename="../src/gui/generalsettings.ui" line="55"/> <source>&Launch on System Startup</source> <translation>&Starten beim Systemstart</translation> </message> @@ -1487,57 +1538,42 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <translation>Zeige &Desktop-Benachrichtigungen</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="58"/> - <source>Use &Monochrome Icons</source> - <translation>&Monochrome Icons verwenden</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="213"/> - <source>Version</source> - <translation>Version</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="240"/> + <location filename="../src/gui/generalsettings.ui" line="220"/> <source>&Update Channel</source> <translation>&Update Kanal</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="346"/> - <source>•</source> - <translation>•</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="76"/> + <location filename="../src/gui/generalsettings.ui" line="102"/> <source>Edit &Ignored Files</source> <translation>I&gnorierte Dateien bearbeiten</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="155"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Synchronisations-Ordner und Explorer-Navigation zeigen</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="172"/> + <location filename="../src/gui/generalsettings.ui" line="93"/> <source>S&how crash reporter</source> <translation>&Crash-Reporter anzeigen</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="289"/> + <location filename="../src/gui/generalsettings.ui" line="269"/> <source>&Restart && Update</source> <translation>&Neustarten && aktualisieren</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="266"/> + <location filename="../src/gui/generalsettings.cpp" line="280"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Autostart kann nicht abgeschaltet werden, da Autostart als Systemeinstellung aktiviert ist.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="176"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>Change update channel?</source> <translation>Update-Kanal verändern?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="177"/> + <location filename="../src/gui/generalsettings.cpp" line="191"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1545,12 +1581,12 @@ Note that this selects only what pool upgrades are taken from, and that there ar Beachten Sie, das dies nur bestimmt von welchem Bereich Sie Upgrades erhalten und dass es keine Downgrade-Möglichkeiten gibt: Ein "Schritt zurück" vom Beta-Kanal zum Stabilen-Kanal kann normalerweise nicht unverzüglich erfolgen und bedeutet Wartezeiten auf eine Stabile-Version, die dann neuer ist als die jeweils aktuell installierte Beta-Version.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="190"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Change update channel</source> <translation>Update-Kanal ändern</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="205"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> @@ -1587,41 +1623,31 @@ Beachten Sie, das dies nur bestimmt von welchem Bereich Sie Upgrades erhalten un </message> <message> <location filename="../src/gui/ignorelisteditor.ui" line="20"/> - <source>Global Ignore Settings</source> - <translation>Globale Ignorier-Einstellungen</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.ui" line="26"/> - <source>Sync hidden files</source> - <translation>Synchronisiere versteckte Dateien</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.ui" line="36"/> <source>Files Ignored by Patterns</source> <translation>Nach Muster ignorierte Dateien</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="75"/> + <location filename="../src/gui/ignorelisteditor.ui" line="59"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="57"/> + <location filename="../src/gui/ignorelisteditor.ui" line="41"/> <source>Pattern</source> <translation>Muster</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="62"/> + <location filename="../src/gui/ignorelisteditor.ui" line="46"/> <source>Allow Deletion</source> <translation>Löschen erlauben</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="85"/> + <location filename="../src/gui/ignorelisteditor.ui" line="69"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="121"/> + <location filename="../src/gui/ignorelisteditor.ui" line="105"/> <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> @@ -1630,22 +1656,22 @@ Items where deletion is allowed will be deleted if they prevent a directory from 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="119"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="112"/> <source>Could not open file</source> <translation>Datei konnte nicht geöffnet werden</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="120"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="113"/> <source>Cannot write changes to '%1'.</source> <translation>Konnte Änderungen nicht in '%1' schreiben.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="146"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="132"/> <source>Add Ignore Pattern</source> <translation>Ignoriermuster hinzufügen</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="147"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> <source>Add a new ignore pattern:</source> <translation>Neues Ignoriermuster hinzufügen:</translation> </message> @@ -1746,38 +1772,56 @@ Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn sie die Löschun <context> <name>OCC::LogBrowser</name> <message> - <location filename="../src/gui/logbrowser.cpp" line="46"/> + <location filename="../src/gui/logbrowser.ui" line="14"/> <source>Log Output</source> <translation>Log-Ausgabe</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="52"/> - <source>The client can write debug logs to a temporary folder. These logs are very helpful for diagnosing problems. -Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space. -If enabled, logs will be written to %1</source> - <translation>Der Client kann Debug-Logs in einen temporären Ordner schreiben. Diese Logs sind sehr hilfreich bei der Fehlersuche. -Da die Log Dateien groß werden können, wird der Client eine neue Datei für jeden Synchronisationslauf anlegen und alte Dateien komprimieren. Es wird außerdem empfohlen das Löschen von Log Dateien nach einigen Stunden einzuschalten. Dies verhindert unnötigen Verbrauch von Plattenplatz. -Logs werden nach %1 geschrieben, wenn eingeschaltet.</translation> - </message> - <message> - <location filename="../src/gui/logbrowser.cpp" line="66"/> + <location filename="../src/gui/logbrowser.ui" line="116"/> <source>Enable logging to temporary folder</source> <translation>Einschalten von Logging in einen temporären Ordner</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> + <location filename="../src/gui/logbrowser.cpp" line="61"/> <source>Delete logs older than %1 hours</source> <translation>Logs löschen, die älter sind als %1 Stunden</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.ui" line="53"/> + <source><html><head/><body><p><span style=" font-weight:600; color:#ff0000;">The logs contain sensitive information which you should not make publicly available</span></p></body></html></source> + <translation><html><head/><body><p><span style=" font-weight:600; color:#ff0000;">Die Logs enthalten sensible Informationen und sollten nicht veröffentlicht werden</span></p></body></html></translation> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="71"/> + <source>The client can write debug logs to a temporary folder. These logs are very helpful for diagnosing problems. +Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space.</source> + <translation>Der Client kann Debug-Logs in einen temporären Ordner schreiben. Diese Logs sind sehr hilfreich bei der Fehlersuche. +Da die Log Dateien groß werden können, wird der Client eine neue Datei für jeden Synchronisationslauf anlegen und alte Dateien komprimieren. Es wird außerdem empfohlen das Löschen von Log Dateien nach einigen Stunden einzuschalten. Dies verhindert unnötigen Verbrauch von Plattenplatz.</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="84"/> + <source>If enabled, logs will be written to:</source> + <translation>Logs werden - wenn eingeschaltet - geschrieben nach:</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="91"/> + <source>C:/log</source> + <translation>C:/log</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="123"/> + <source>Log Http traffic </source> + <translation>HTTP Datenverkehr loggen</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="143"/> <source>These settings persist across client restarts. Note that using any logging command line options will override the settings.</source> <translation>Diese Einstellungen bleiben nach einem Neustart des Clients erhalten. Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen überschreiben.</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="85"/> + <location filename="../src/gui/logbrowser.ui" line="154"/> <source>Open folder</source> <translation>Ordner öffnen</translation> </message> @@ -1785,12 +1829,12 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers <context> <name>OCC::Logger</name> <message> - <location filename="../src/libsync/logger.cpp" line="186"/> + <location filename="../src/libsync/logger.cpp" line="177"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="187"/> + <location filename="../src/libsync/logger.cpp" line="178"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Datei »%1«<br/>kann nicht zum Schreiben geöffnet werden.<br/><br/>Die Protokolldatei kann <b>nicht</b> gespeichert werden!</nobr></translation> </message> @@ -1965,23 +2009,23 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers <context> <name>OCC::NotificationWidget</name> <message> - <location filename="../src/gui/notificationwidget.cpp" line="65"/> + <location filename="../src/gui/notificationwidget.cpp" line="59"/> <source>Created at %1</source> <translation>Erstellt von %1</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="78"/> + <location filename="../src/gui/notificationwidget.cpp" line="72"/> <source>Closing in a few seconds...</source> <translation>Schließe in wenigen Sekunden...</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="125"/> + <location filename="../src/gui/notificationwidget.cpp" line="119"/> <source>%1 request failed at %2</source> <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment> <translation>%1 Anfrage an %2 fehlgeschlagen</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="131"/> + <location filename="../src/gui/notificationwidget.cpp" line="125"/> <source>'%1' selected at %2</source> <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment> <translation>'%1' ausgewählt von %2</translation> @@ -1990,68 +2034,77 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> + <location filename="../src/libsync/creds/oauth.cpp" line="127"/> <source>Error returned from the server: <em>%1</em></source> <translation>Fehler vom Server zurückgegeben: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="130"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>Beim Zugriff auf den 'token' Endpunkt trat ein Fehler auf: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="134"/> <source>Empty JSON from OAuth2 redirect</source> <translation>Leere JSON-Antwort von der OAuth2 Weiterleitung</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="139"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Die JSON Antwort des Servers konnte nicht geparst werden: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="142"/> <source>Unsupported token type: %1</source> - <translation type="unfinished"/> + <translation>Nicht unterstützter Tokentyp: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="151"/> + <location filename="../src/libsync/creds/oauth.cpp" line="144"/> <source>The reply from the server did not contain all expected fields :%1</source> - <translation type="unfinished"/> + <translation>Die Antwort des Servers hat nicht alle erwarteten Felder beinhaltet +:%1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="153"/> + <location filename="../src/libsync/creds/oauth.cpp" line="146"/> <source>Unknown Error</source> - <translation type="unfinished"/> + <translation>Unbekannter Fehler</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="291"/> + <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> + <translation><h1>Anmeldefehler </h1><p>Konnte Benutzerdaten nicht auslesen</p></translation> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> - <translation type="unfinished"/> + <translation> Fehler: Fehlendes Feld %1 +</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="157"/> + <location filename="../src/libsync/creds/oauth.cpp" line="150"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Anmeldefehler </h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="202"/> - <location filename="../src/libsync/creds/oauth.cpp" line="205"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> - <translation type="unfinished"/> + <translation>Fehler beim Erneuern des Tokens: %1: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="214"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> - <translation type="unfinished"/> + <translation>Die Antwort des Servers enthält nicht alle erwarteten Felder +:%1 +Empfangene Daten: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="235"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>Falscher Benutzer</h1><p>Sie haben sich mit dem Benutzer <em>%1</em> angemeldet, sollten sich jedoch mit dem Benutzer <em>%2</em> anmelden. <br>Bitte melden Sie sich in einem anderen Tab von %3 ab und <a href='%4'>klicken Sie hier</a> um sich als %2</p> anzumelden</translation> </message> @@ -2118,58 +2171,58 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="50"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/> <source>Connect to %1</source> <translation>Verbinden mit %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="52"/> <source>Setup local folder options</source> <translation>Einstellungen der Optionen für lokale Verzeichnisse </translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="60"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="61"/> <source>Connect...</source> <translation>Verbinden…</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="85"/> - <source>Use &virtual files instead of downloading content immediately %1</source> - <translation>&Virtuelle Dateien verwenden, anstatt die Dateien herunter zu laden %1</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="86"/> - <source>(tech preview)</source> - <translation>(Tech-Vorschau)</translation> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> + <source> (experimental)</source> + <translation>(Experimentell)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="86"/> - <source>(experimental)</source> - <translation>(Experimentell)</translation> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> + <source>Use &virtual files instead of downloading content immediately%1</source> + <translation>&Virtuelle Dateien verwenden, anstatt die Dateien herunter zu laden%1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="178"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 Ordner '%2' wird mit dem lokalen Ordner '%3' synchronisiert</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <source>Sync the folder '%1'</source> <translation>Ordner '%1' synchronisieren</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="202"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Achtung:</strong> Der lokale Ordner ist nicht leer. Bitte wählen Sie eine entsprechende Lösung!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="283"/> + <source>Virtual files are not available for the selected folder</source> + <translation>Virtuelle Dateien sind für den ausgewählten Ordner nicht verfügbar</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="343"/> <source>Local Sync Folder</source> <translation>Lokaler Ordner für die Synchronisation</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="350"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="377"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="412"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2246,39 +2299,39 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> <source>Connect to %1</source> <translation>Verbinden mit %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> <source>Setup %1 server</source> <translation>%1 Server einrichten</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="132"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation>Diese URL ist NICHT sicher, das sie nicht verschlüsselt ist. Es ist nicht ratsam, diese zu benutzen.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="136"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> <source>This url is secure. You can use it.</source> <translation>Diese URL ist sicher. Sie können Sie benutzen.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="175"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> <source>&Next ></source> <translation>&Weiter ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> <source>Invalid URL</source> <translation>Ungültige URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Zertifikat kann nicht geladen werden. Falsches Passwort?</translation> </message> @@ -2286,144 +2339,144 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="251"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="226"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Erfolgreich mit %1 verbunden: %2 Version %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Die Verbindung zu %1 auf %2:<br/>%3 konnte nicht hergestellt werden</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Zeitüberschreitung beim Verbindungsversuch mit %1 unter %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="291"/> <source>Trying to connect to %1 at %2...</source> <translation>Verbindungsversuch mit %1 unter %2…</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>Die Authentifizierungs-Anfrage an den Server wurde weitergeleitet an '%1'. Diese Adresse ist ungültig, der Server ist falsch konfiguriert.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>Es gab eine ungültige Reaktion auf eine WebDav-Authentifizierungs-Anfrage</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Zugang vom Server nicht erlaubt. <a href="%1">Klicken Sie hier</a> zum Zugriff auf den Dienst mithilfe Ihres Browsers, so dass Sie sicherstellen können, dass Ihr Zugang ordnungsgemäß funktioniert.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/> <source>Invalid URL</source> <translation>Ungültige URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="434"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Lokaler Sync-Ordner %1 existiert bereits, aktiviere Synchronistation.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>Lokaler Synchronisations-Ordner %1 wird erstellt ...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="443"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>fehlgeschlagen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>Der lokale Ordner %1 konnte nicht angelegt werden</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="471"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>Keinen entfernten Ordner angegeben!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="477"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Fehler: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>erstelle Ordner auf ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="506"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>Remoteordner %1 erfolgreich erstellt.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Der Ordner %1 ist auf dem Server bereits vorhanden. Verbinde zur Synchronisation.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Das Erstellen des Verzeichnisses erzeugte den HTTP-Fehler-Code %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Die Remote-Ordner-Erstellung ist fehlgeschlagen, weil die angegebenen Zugangsdaten falsch sind. Bitte gehen Sie zurück und überprüfen Sie die Zugangsdaten.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Die Remote-Ordner-Erstellung ist fehlgeschlagen, vermutlich sind die angegebenen Zugangsdaten falsch.</font><br/>Bitte gehen Sie zurück und überprüfen Sie Ihre Zugangsdaten.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Remote-Ordner %1 konnte mit folgendem Fehler nicht erstellt werden: <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Eine Synchronisationsverbindung für Ordner %1 zum entfernten Ordner %2 wurde eingerichtet.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>Erfolgreich verbunden mit %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Die Verbindung zu %1 konnte nicht hergestellt werden. Bitte prüfen Sie die Einstellungen erneut.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="567"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Ordner umbenennen fehlgeschlagen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="568"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Der Ordner kann nicht entfernt und gesichert werden, da der Ordner oder einer seiner Dateien in einem anderen Programm geöffnet ist. Bitte schließen Sie den Ordner oder die Datei oder beenden Sie die Installation.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Lokaler Sync-Ordner %1 erfolgreich erstellt!</b></font></translation> </message> @@ -2431,46 +2484,22 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="78"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>%1 Verbindungsassistent</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="251"/> - <source>Enable technical preview feature?</source> - <translation>Feature aus der technischen Vorschau freischalten?</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/> - <source>When the "virtual files" 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.</source> - <translation>Wenn der Modus "Virtuelle Dateien" freigeschaltet ist, werden die Dateien nicht sofort heruntergeladen. Stattdessen wird für jede Datei des Servers eine Platzhalter-Datei erstellt. Der Inhalt der Datei wird beim Ausführen 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 "Selective Sync" gegenseitig aus. Aktuell abgewählte Ordner werden zu nur online verfügbaren Ordnern umgesetzt und die Einstellungen im "Selective Sync" werden verworfen.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="260"/> - <source>Enable virtual files</source> - <translation> Virtuelle Dateien freischalten</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/> - <source>Continue to use selective sync</source> - <translation>Selective Sync weiterbenutzen</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="266"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation>Experimentelle Funktion aktivieren?</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="280"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="271"/> <source>Enable experimental placeholder mode</source> <translation>Experimentellen Platzhalter Modus freischalten</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="267"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/> <source>When the "virtual files" mode is enabled no files will be downloaded initially. Instead, a tiny "%1" 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. @@ -2485,7 +2514,7 @@ Der Modus virtuelle Dateien schließt sich mit dem Modus "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="281"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation>Sicher bleiben</translation> </message> @@ -2614,12 +2643,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Der Server meldet kein %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1246"/> + <location filename="../src/libsync/discovery.cpp" line="1244"/> <source>Moved to invalid target, restoring</source> <translation>An ungültigen Zielort verschoben, Wiederherstellung</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1259"/> + <location filename="../src/libsync/discovery.cpp" line="1257"/> <source>Not allowed to remove, restoring</source> <translation>Löschen nicht erlaubt, Wiederherstellung</translation> </message> @@ -2639,17 +2668,17 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1223"/> + <location filename="../src/libsync/discovery.cpp" line="1222"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1368"/> + <location filename="../src/libsync/discovery.cpp" line="1367"/> <source>Error while reading the database</source> <translation>Fehler beim Lesen der Datenbank</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1428"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>Der Server meldet einen Fehler beim Lesen des Ordners '%1' : %2</translation> </message> @@ -2657,7 +2686,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1001"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1006"/> <source>Error writing metadata to the database</source> <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> </message> @@ -2727,22 +2756,22 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="147"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="146"/> <source>could not delete file %1, error: %2</source> <translation>Konnte Datei %1 nicht löschen. Fehler: %2</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="162"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Achtung, es könnte ein Problem mit der Groß- und Kleinschreibung für %1 auftreten</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="168"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> <source>could not create folder %1</source> <translation>Ordner %1 konnte nicht angelegt werden </translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="179"/> <source>Error writing metadata to the database</source> <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> </message> @@ -2750,7 +2779,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="100"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> <source>Could not remove %1 because of a local file name clash</source> <translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gelöscht werden</translation> </message> @@ -2758,18 +2787,18 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="218"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht zu %2 umbenannt werden</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="249"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="255"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="248"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="254"/> <source>Error writing metadata to the database</source> <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="261"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> <source>Error setting pin state</source> <translation>Fehler beim Setzen des PIN-Zustandes</translation> </message> @@ -2848,7 +2877,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Das Hochladen von %1 überschreitet das Speicherkontingent des Ordners </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="663"/> + <location filename="../src/libsync/propagateupload.cpp" line="677"/> <source>Error writing metadata to the database</source> <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> </message> @@ -2889,12 +2918,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::PropagateUploadFileTUS</name> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="203"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation> </message> @@ -3066,35 +3095,40 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::SettingsDialog</name> <message> - <location filename="../src/gui/settingsdialog.cpp" line="117"/> + <location filename="../src/gui/settingsdialog.cpp" line="196"/> <source>Settings</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="108"/> + <location filename="../src/gui/settingsdialog.cpp" line="187"/> <source>Activity</source> <translation>Aktivität</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="128"/> - <location filename="../src/gui/settingsdialog.cpp" line="131"/> + <location filename="../src/gui/settingsdialog.cpp" line="176"/> + <source>Add account</source> + <translation>Konto hinzufügen</translation> + </message> + <message> + <location filename="../src/gui/settingsdialog.cpp" line="207"/> + <location filename="../src/gui/settingsdialog.cpp" line="210"/> <source>Quit %1</source> <translation>%1 beenden</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="132"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> <source>Are you sure you want to quit %1?</source> <translation>Sind Sie sicher, dass sie %1 beenden möchten?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="254"/> + <location filename="../src/gui/settingsdialog.cpp" line="342"/> <source>Account</source> <translation>Benutzerkonto</translation> </message> <message> <location filename="../src/gui/settingsdialog.ui" line="14"/> <source>MainWindow</source> - <translation type="unfinished"/> + <translation>Hauptfenster</translation> </message> <message> <location filename="../src/gui/settingsdialog.ui" line="39"/> @@ -3125,42 +3159,42 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>ownCloud-Pfad:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="108"/> + <location filename="../src/gui/sharedialog.cpp" line="110"/> <source>%1 Sharing</source> <translation>%1-Freigabe</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="86"/> + <location filename="../src/gui/sharedialog.cpp" line="88"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="105"/> + <location filename="../src/gui/sharedialog.cpp" line="107"/> <source>Folder: %2</source> <translation>Ordner: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="111"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>The server does not allow sharing</source> <translation>Der Server erlaubt das teilen nicht</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="127"/> + <location filename="../src/gui/sharedialog.cpp" line="129"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Abrufen der maximal möglichen Freigabeberechtigungen vom Server...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="197"/> + <location filename="../src/gui/sharedialog.cpp" line="202"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Die Datei kann nicht geteilt werden, weil sie ohne erneute Teilungs-Berechtigung für Sie geteilt wurde.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="211"/> + <location filename="../src/gui/sharedialog.cpp" line="216"/> <source>Users and Groups</source> <translation>Nutzer und Gruppen</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="218"/> + <location filename="../src/gui/sharedialog.cpp" line="223"/> <source>Public Links</source> <translation>Öffentliche Links</translation> </message> @@ -3355,32 +3389,32 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation><html><head/><body><p>Sie können Personen direkt zu dieser Freigabe leiten, wenn Sie Ihnen diesen <a href="private link menu"><span style=" text-decoration: underline">privaten Link</span></a> geben.</p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="210"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> <source>The item is not shared with any users or groups</source> <translation>Das Element wird mit keinem Benutzer oder Gruppe geteilt</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="241"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> <source>Open link in browser</source> <translation>Link im Browser öffnen</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> <source>Copy link to clipboard</source> <translation>Link in Zwischenablage kopieren</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> <source>Send link by email</source> <translation>Link als E-Mail verschicken</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="255"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> <source>No results for '%1'</source> <translation>Keine Ergebnisse für '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> <source>I shared something with you</source> <translation>Ich habe etwas mit Ihnen geteilt</translation> </message> @@ -3414,17 +3448,17 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> <source>create</source> <translation>erstellen</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> <source>change</source> <translation>Ändern</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> <source>delete</source> <translation>löschen</translation> </message> @@ -3793,17 +3827,17 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Nur %1 sind verfügbar. Zum Beginnen werden mindestens %2 benötigt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="482"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation>Öffnen oder Erstellen der Sync-Datenbank nicht möglich. Bitte sicherstellen, dass Schreibrechte für den zu synchronisierenden Ordner existieren.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1035"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Der freie Speicherplatz wird knapp: Downloads, die den freien Speicher unter %1 senken, wurden ausgelassen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1042"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Auf dem Server ist für einige Dateien zum Hochladen nicht genug Platz.</translation> </message> @@ -3818,27 +3852,27 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Metadaten der virtuellen Datei konnten nicht aktualisiert werden: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="498"/> <source>Using virtual files with suffix, but suffix is not set</source> <translation>Virtuelle Dateien mit Dateiendung werden genutzt, aber die Dateiendung ist nicht definiert</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="515"/> + <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>Unable to read the blacklist from the local database</source> <translation>Fehler beim Einlesen der Blacklist aus der lokalen Datenbank</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="546"/> + <location filename="../src/libsync/syncengine.cpp" line="541"/> <source>Unable to read from the sync journal.</source> <translation>Fehler beim Einlesen des Synchronisierungsprotokolls.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="630"/> + <location filename="../src/libsync/syncengine.cpp" line="625"/> <source>Cannot open the sync journal</source> <translation>Synchronisationsbericht kann nicht geöffnet werden</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1018"/> <source>Aborted</source> <translation>Abgebrochen</translation> </message> @@ -3854,19 +3888,9 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="341"/> - <source><p>Version %2. For more information visit <a href="%3">https://%4</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Hannah von Reth, and others.</small></p></source> - <translation><p>Version %2. Für mehr Informationen gehe auf <a href="%3">https://%4 </a></p><p>Für bekannte Probleme und Hilfe gehe bitte auf: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>Von Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Hannah von Reth und anderen.</small></p></translation> - </message> - <message> - <location filename="../src/libsync/theme.cpp" line="348"/> - <source><p>Copyright ownCloud GmbH</p></source> - <translation><p>Copyright ownCloud GmbH</p></translation> - </message> - <message> - <location filename="../src/libsync/theme.cpp" line="349"/> - <source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source> - <translation><p>Zur Verfügung gestellt durch %1 und lizenziert unter der GNU General Public License (GPL) Version 2.0.<br>%2 und das %2 Logo sind eingetragene Warenzeichen von %1 in den Vereinigten Staaten, anderen Ländern oder beides.</p></translation> + <location filename="../src/libsync/theme.cpp" line="382"/> + <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> + <translation><p>Version %1. Weitere Informationen unter <a href="%3">https://%4</a></p><p>Für bekannte Fehler und die Hilfe, besuchen Sie bitte: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>Von Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth und anderen.</small></p><p>Copyright ownCloud GmbH</p><p>Lizenziert unter den Bedingungen der GNU General Public License (GPL) Version 2.0.<br/>%5 und das %5 Logo sind eingetragene Warenzeichen von %4 in den USA, anderen Ländern, oder beidem.</p></translation> </message> </context> <context> @@ -3884,249 +3908,256 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <message> <location filename="../src/common/checksums.cpp" line="361"/> <source>The downloaded file does not match the checksum, it will be resumed. '%1' != '%2'</source> - <translation type="unfinished"/> + <translation>Die heruntergeladene Datei entspricht nicht der Prüfsumme, das Herunterladen wird wiederaufgenommen. '%1' != '%2'</translation> + </message> +</context> +<context> + <name>OCC::Vfs</name> + <message> + <location filename="../src/common/vfs.cpp" line="72"/> + <source>The Virtual filesystem feature requires a NTFS file system, %1 is using %2</source> + <translation>Das Feature Virtuelle Dateien benötigt ein NTFS Dateisystem, %1 benutzt %2</translation> </message> </context> <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="267"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Please sign in</source> <translation>Bitte melden Sie sich an</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="313"/> + <location filename="../src/gui/owncloudgui.cpp" line="304"/> <source>Folder %1: %2</source> <translation>Ordner %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Es wurden keine Synchonisationsordner konfiguriert.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="340"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Im Browser öffnen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="389"/> - <location filename="../src/gui/owncloudgui.cpp" line="712"/> - <location filename="../src/gui/owncloudgui.cpp" line="806"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Log in...</source> <translation>Einloggen...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="393"/> - <location filename="../src/gui/owncloudgui.cpp" line="704"/> - <location filename="../src/gui/owncloudgui.cpp" line="808"/> + <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Log out</source> <translation>Abmelden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="499"/> + <location filename="../src/gui/owncloudgui.cpp" line="490"/> <source>Recent Changes</source> <translation>Letzte Änderungen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="358"/> <source>Managed Folders:</source> <translation>Verwaltete Ordner:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="361"/> <source>Open folder '%1'</source> <translation>Ordner »%1« öffnen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="342"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>%1 im Browser öffnen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="190"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation>Der Server mit Konto %1 läuft mit einer nicht unterstützten Version %2. Die Verwendung dieses Clienten mit nicht unterstützten Serverversionen ist ungetestet und möglicherweise gefährlich. Fortfahren auf eigenes Risiko.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="789"/> + <location filename="../src/gui/owncloudgui.cpp" line="780"/> <source>Unknown status</source> <translation>Unbekannter Status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Settings...</source> <translation>Einstellungen …</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>Details...</source> <translation>Details …</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="799"/> + <location filename="../src/gui/owncloudgui.cpp" line="790"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="803"/> + <location filename="../src/gui/owncloudgui.cpp" line="794"/> <source>Quit %1</source> <translation>%1 beenden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="248"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Disconnected from %1</source> <translation>Von %1 trennen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="198"/> + <location filename="../src/gui/owncloudgui.cpp" line="189"/> <source>Unsupported Server Version</source> <translation>nicht unterstützte Server Version</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="238"/> + <location filename="../src/gui/owncloudgui.cpp" line="229"/> <source>Disconnected</source> <translation>Getrennt</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="240"/> + <location filename="../src/gui/owncloudgui.cpp" line="231"/> <source>Disconnected from some accounts</source> <translation>Die Verbindungen zu einigen Konten wurde getrennt</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from accounts:</source> <translation>Verbindungen zu Konten wurde getrennt:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="253"/> + <location filename="../src/gui/owncloudgui.cpp" line="244"/> <source>Account %1: %2</source> <translation>Konto %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> <source>Signed out</source> <translation>Abgemeldet</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="272"/> + <location filename="../src/gui/owncloudgui.cpp" line="263"/> <source>Account synchronization is disabled</source> <translation>Account Synchronisation ist deaktiviert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="264"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>Synchronisation pausiert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="321"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>Unresolved conflicts</source> <translation>Ungelöste Konflikte</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="328"/> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Fehler bei der Synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>Keine Ordner zur Synchronisation konfiguriert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="378"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Unpause all folders</source> <translation>Setze alle Ordner fort</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="383"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> <source>Pause all folders</source> <translation>Stoppe alle Ordner</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="683"/> + <location filename="../src/gui/owncloudgui.cpp" line="674"/> <source>Unpause all synchronization</source> <translation>Setze gesamte Synchronisation fort</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="685"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause synchronization</source> <translation>Setze Synchronisation fort</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="693"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Pause all synchronization</source> <translation>Stoppe gesamte Synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause synchronization</source> <translation>Stoppe Synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="702"/> + <location filename="../src/gui/owncloudgui.cpp" line="693"/> <source>Log out of all accounts</source> <translation>Bei allen Konten abmelden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="710"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> <source>Log in to all accounts...</source> <translation>Bei allen Konten anmelden...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>New account...</source> <translation>Neues Konto...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="801"/> - <location filename="../src/gui/owncloudgui.cpp" line="1151"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>About %1</source> <translation>Über %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="834"/> + <location filename="../src/gui/owncloudgui.cpp" line="825"/> <source>No items synced recently</source> <translation>Keine kürzlich synchronisierten Elemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="856"/> + <location filename="../src/gui/owncloudgui.cpp" line="847"/> <source>Checking for changes in remote '%1'</source> <translation>Änderungen der entfernten Ressource '%1' werden geprüft</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in local '%1'</source> <translation>Änderungen der lokalen Ressource '%1' werden geprüft</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="874"/> + <location filename="../src/gui/owncloudgui.cpp" line="865"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Synchronisiere %1 von %2 (%3 übrig)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="879"/> + <location filename="../src/gui/owncloudgui.cpp" line="870"/> <source>Syncing %1 of %2</source> <translation>Synchronisiere %1 von %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="888"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 (%2 left)</source> <translation>Synchronisiere %1 (%2 übrig)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="891"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1</source> <translation>Synchronisiere %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="909"/> + <location filename="../src/gui/owncloudgui.cpp" line="899"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> <source>Up to date</source> <translation>Aktuell</translation> </message> @@ -4140,84 +4171,82 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="52"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="108"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="207"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="316"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="490"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="501"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="135"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="234"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="553"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="564"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="62"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="86"/> <source>Server</source> <translation>Server</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="414"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="477"/> <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source> <translation><html><head/><body><p>Wenn diese Option gesetzt ist, werden bestehende Inhalte im lokalen Ordner gelöscht, um eine saubere Synchronisation nur der Serverdaten zu ermöglichen.</p><p>Wählen Sie diese Option nicht, wenn die lokale Inhalte auf den Server übertragen werden sollen.</p></body></html></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="417"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="480"/> <source>Start a &clean sync (Erases the local folder!)</source> <translation>Saubere Syn&chronisation beginnen (entfernt lokalen Ordner!)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="165"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="192"/> <source>Ask for confirmation before synchroni&zing folders larger than</source> <translation>Nachfragen, bei Synchronisation von Ordnern grösser als</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="182"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="209"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="191"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="218"/> <source>Ask for confirmation before synchronizing e&xternal storages</source> <translation>Nachfragen, bei Synchronisation von externen Speichern</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="227"/> <source>Choose what to sync</source> <translation>Zu synchronisierende Elemente auswählen</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="245"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="248"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="272"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="275"/> <source><html><head/><body><p>When this option is selected, the wizard will close without synchronizing anything. You can use the &quot;Add Folder Sync Connection&quot; button from the account settings to choose which pair of local and remote folder you wish to synchronize</p></body></html></source> <translation><html><head/><body><p>Wenn diese Option angewählt ist, wird der Installationsassistent, ohne irgendetwas zu synchronisieren, beendet. Sie können den &quot;Synchronisationsverzeichnis&quot; Button in den Kontoeinstellungen nutzen, um das Ordnerpaar zwischen lokal und entfernt festzulegen, die Sie synchronisieren möchten</p></body></html></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="251"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/> <source>Manually create folder sync connections </source> <translation>Manuell Synchronisationsverzeichnis erstellen</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="332"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> <source>&Local Folder</source> <translation>&Lokaler Ordner</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="373"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="436"/> <source>pbSelectLocalFolder</source> <translation>pbSelectLocalFolder</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="404"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="467"/> <source>&Keep local data</source> <translation>&Lokale Daten behalten</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="125"/> <source>S&ynchronize everything from server (recommended)</source> <translation>Alle Daten vom Server s&ynchronisieren (empfohlen)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="435"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="498"/> <source>Status message</source> <translation>Statusnachricht</translation> </message> @@ -4272,7 +4301,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="196"/> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -4287,7 +4316,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>https://…</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="160"/> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> <source>Error Label</source> <translation>Fehler-Label</translation> </message> @@ -4319,37 +4348,37 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>in der Zukunft</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>vor %n Tage(n)</numerusform><numerusform>vor %n Tage(n)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>vor %n Stunde(n)</numerusform><numerusform>vor %n Stunde(n)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>jetzt</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>vor weniger als einer Minute</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>vor %n Minute(n)</numerusform><numerusform>vor %n Minute(n)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>vor einiger Zeit</translation> </message> @@ -4432,11 +4461,27 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber </message> </context> <context> - <name>ownCloudTheme::about()</name> + <name>ownCloudTheme::aboutVersions()</name> + <message> + <location filename="../src/libsync/theme.cpp" line="360"/> + <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> + <translation>%1 %2 %3 %4%8%Bibliotheken: Qt %5, %6%8Verwendete Erweiterung für Virtuelle Dateien: %7</translation> + </message> +</context> +<context> + <name>ownCloudTheme::qtVer</name> + <message> + <location filename="../src/libsync/theme.cpp" line="350"/> + <source>%1 (Built against Qt %1)</source> + <translation>%1 (Mit Qt %1 gebaut)</translation> + </message> +</context> +<context> + <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="320"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> - <translation><p><small>Gebaut aus der GIT-Revision <a href="%1">%2</a> am %3, %4; verwendet Qt %5, %6</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="355"/> + <source>%1 %2</source> + <translation>%1 %2</translation> </message> </context> <context> @@ -4542,52 +4587,52 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Status nicht definiert</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>Warte, um mit der Synchronistation zu beginnen</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>Synchronisation läuft</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Synchronisation erfolgreich</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>Synchronisation abgeschlossen, einige Dateien wurden ignoriert.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Synchronisationsfehler</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Installationsfehler</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>Synchronisation wird vorbereitet</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>Abbruch …</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>Synchronisation wird angehalten</translation> </message> @@ -4595,53 +4640,53 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>utility</name> <message> - <location filename="../src/gui/guiutility.cpp" line="38"/> + <location filename="../src/gui/guiutility.cpp" line="39"/> <source>Could not open browser</source> <translation>Konnte Browser nicht öffnen</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="39"/> + <location filename="../src/gui/guiutility.cpp" line="40"/> <source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source> <translation>Die URL %1 konnte aufgrund eines Fehlers nicht aufgerufen werden. Ist vielleicht kein Standard-Browser konfiguriert?</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="62"/> + <location filename="../src/gui/guiutility.cpp" line="63"/> <source>Could not open email client</source> <translation>Die E-Mail Anwendung konnte nicht geöffnet werden</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="63"/> + <location filename="../src/gui/guiutility.cpp" line="64"/> <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source> <translation>Es ist ein Fehler beim Öffnen einer E-Mail Anwendung zum Erstellen einer neuen Nachricht aufgetreten. Vielleicht ist keine E-Mail Anwendung konfiguriert?</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="78"/> + <location filename="../src/gui/guiutility.cpp" line="79"/> <source>Always available locally</source> <translation>Immer lokal verfügbar</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="82"/> + <location filename="../src/gui/guiutility.cpp" line="83"/> <source>Some available online only</source> <translation>Nur einige Online verfügbar</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="84"/> - <location filename="../src/gui/guiutility.cpp" line="86"/> + <location filename="../src/gui/guiutility.cpp" line="85"/> + <location filename="../src/gui/guiutility.cpp" line="87"/> <source>Available online only</source> <translation>Nur Online verfügbar</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="80"/> + <location filename="../src/gui/guiutility.cpp" line="81"/> <source>Currently available locally</source> <translation>Aktuell lokal verfügbar</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="93"/> + <location filename="../src/gui/guiutility.cpp" line="94"/> <source>Make always available locally</source> <translation>Auf immer lokal verfügbar umschalten</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="98"/> + <location filename="../src/gui/guiutility.cpp" line="99"/> <source>Free up local space</source> <translation>Lokalen Speicherplatz freigeben</translation> </message> diff --git a/translations/client_el.ts b/translations/client_el.ts index 448aa66a1..9c4dc2826 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -146,7 +146,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="131"/> + <location filename="../src/libsync/account.cpp" line="121"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -517,12 +517,12 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 σε %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 σε %2 (αποσυνδεδεμένο)</translation> </message> @@ -2075,7 +2075,7 @@ Note that using any logging command line options will override the settings.</so <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="295"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation type="unfinished"/> @@ -2086,21 +2086,21 @@ Note that using any logging command line options will override the settings.</so <translation><h1>Σφάλμα εισόδου</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="206"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="218"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="239"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>Λάθος χρήστης</h1><p> Συνδεθήκατε με το χρήστη <em>%1</em>, αλλά πρέπει να συνδεθείτε με το χρήστη <em>%2</em>. <br>Παρακαλούμε αποσυνδεθείτε από τον %3 σε άλλη καρτέλα, στη συνέχεια <a href='%4'>κάντε κλικ εδώ</a> και συνδεθείτε ως χρήστης %2</p></translation> </message> @@ -2356,17 +2356,17 @@ It is not advisable to use it.</source> <translation>Προσπάθεια σύνδεσης στο %1 για %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>Η πιστοποιημένη αίτηση στον διακομιστή ανακατευθύνθηκε σε '%1'. Το URL είναι εσφαλμένο, ο διακομιστής δεν έχει διαμορφωθεί σωστά.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>Υπήρξε μια άκυρη απόκριση σε μια πιστοποιημένη αίτηση </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="370"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Απαγόρευση πρόσβασης από τον διακομιστή. Για να επιβεβαιώσετε ότι έχετε δικαιώματα πρόσβασης, <a href="%1">πατήστε εδώ</a> για να προσπελάσετε την υπηρεσία με το πρόγραμμα πλοήγησής σας.</translation> </message> @@ -2376,104 +2376,104 @@ It is not advisable to use it.</source> <translation>Μη έγκυρη URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Ο τοπικός φάκελος συγχρονισμού %1 υπάρχει ήδη, ρύθμιση για συγχρονισμό.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="427"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>Δημιουργία τοπικού φακέλου συγχρονισμού %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>οκ</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="433"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>απέτυχε.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="435"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>Αδυναμία δημιουργίας τοπικού φακέλου %1 </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>Δεν προσδιορίστηκε κανένας απομακρυσμένος φάκελος!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Σφάλμα: %1 </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="480"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>δημιουργία φακέλου στο ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>Ο απομακρυσμένος φάκελος %1 δημιουργήθηκε με επιτυχία.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Ο απομακρυσμένος φάκελος %1 υπάρχει ήδη. Θα συνδεθεί για συγχρονισμό. </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="502"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Η δημιουργία φακέλου είχε ως αποτέλεσμα τον κωδικό σφάλματος HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="504"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Η δημιουργία απομακρυσμένου φακέλλου απέτυχε επειδή τα διαπιστευτήρια είναι λάθος!<br/>Παρακαλώ επιστρέψετε και ελέγξετε τα διαπιστευτήριά σας.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Η δημιουργία απομακρυσμένου φακέλου απέτυχε, πιθανώς επειδή τα διαπιστευτήρια που δόθηκαν είναι λάθος.</font><br/>Παρακαλώ επιστρέψτε πίσω και ελέγξτε τα διαπιστευτήρια σας.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Η δημιουργία απομακρυσμένου φακέλου %1 απέτυχε με σφάλμα <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Μια σύνδεση συγχρονισμού από τον απομακρυσμένο κατάλογο %1 σε %2 έχει ρυθμιστεί. </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>Επιτυχής σύνδεση με %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Αδυναμία σύνδεσης στον %1. Παρακαλώ ελέξτε ξανά.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Αποτυχία μετονομασίας φακέλου</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Αδυναμία αφαίρεσης και δημιουργίας αντιγράφου ασφαλείας του φακέλου διότι ο φάκελος ή ένα αρχείο του είναι ανοικτό από άλλο πρόγραμμα. Παρακαλώ κλείστε τον φάκελο ή το αρχείο και πατήστε επανάληψη ή ακυρώστε την ρύθμιση.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="610"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Επιτυχής δημιουργία τοπικού φακέλου %1 για συγχρονισμό!</b></font></translation> </message> @@ -3887,7 +3887,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="357"/> + <location filename="../src/libsync/theme.cpp" line="382"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4347,37 +4347,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>στο μέλλον</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>%n μέρα(ες) πριν</numerusform><numerusform>%n μέρα(ες) πριν</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>%n ώρα(ες) πριν</numerusform><numerusform>%n ώρα(ες) πριν</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>τώρα</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>Λιγότερο από ένα λεπτό πριν</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>%n λεπτό(ά) πριν</numerusform><numerusform>%n λεπτό(ά) πριν</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>Λίγη ώρα πριν</translation> </message> @@ -4462,7 +4462,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="332"/> + <location filename="../src/libsync/theme.cpp" line="360"/> <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> <translation type="unfinished"/> </message> @@ -4470,7 +4470,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="322"/> + <location filename="../src/libsync/theme.cpp" line="350"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4478,7 +4478,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="327"/> + <location filename="../src/libsync/theme.cpp" line="355"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4586,52 +4586,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Απροσδιόριστη κατάσταση</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>Αναμονή έναρξης συγχρονισμού</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>Ο συγχρονισμός εκτελείται</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Επιτυχημένος Συγχρονισμός</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>Επιτυχία Συγχρονισμού, κάποια αρχεία αγνοήθηκαν.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Σφάλμα Συγχρονισμού</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Σφάλμα Ρυθμίσεων</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>Προετοιμασία για συγχρονισμό</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>Ματαίωση σε εξέλιξη...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>Παύση συγχρονισμού</translation> </message> diff --git a/translations/client_es.ts b/translations/client_es.ts index 86a4c39f7..d11f5f551 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -146,7 +146,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="131"/> + <location filename="../src/libsync/account.cpp" line="121"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -517,12 +517,12 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 en %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 en %2 (desconectado)</translation> </message> @@ -1801,7 +1801,7 @@ Since log files can get large, the client will start a new one for each sync run <message> <location filename="../src/gui/logbrowser.ui" line="84"/> <source>If enabled, logs will be written to:</source> - <translation type="unfinished"/> + <translation>Si se habilita, los logs serán escritos en:</translation> </message> <message> <location filename="../src/gui/logbrowser.ui" line="91"/> @@ -2072,10 +2072,10 @@ Tenga en cuenta que el uso de cualquier opción de línea de comando de registro <message> <location filename="../src/libsync/creds/oauth.cpp" line="170"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> - <translation type="unfinished"/> + <translation><h1>Error de acceso</h1><p>Fallo al tratar de obtener información del usuario</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="295"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation> Error: Campo faltante %1 @@ -2087,14 +2087,14 @@ Tenga en cuenta que el uso de cualquier opción de línea de comando de registro <translation><h1>Error de Login</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="206"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation>Error al actualizar el token: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="218"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2103,7 +2103,7 @@ Received data: %2</source> Datos recibidos: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="239"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>Usuario incorrecto</h1><p>Se ha intentado logar con el usuario: <em>%1</em>, pero debe logarse con el usuario: <em>%2</em>.<br>Por favor des-loguese de %3 en otra pestaña, entonces<a href='%4'>click aqui</a> y loguese como el usuario %2</p></translation> </message> @@ -2358,17 +2358,17 @@ No se recomienda usarla.</translation> <translation>Intentando conectar a %1 desde %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>La petición autenticada al servidor ha sido redirigida a '%1'. La dirección URL es errónea, el servidor está mal configurado.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>Ha habido una respuesta no válida a una solicitud autenticada de webdav</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="370"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Acceso denegado por el servidor. Para verificar que usted tiene acceso, <a href="%1">haga clic aquí</a> para acceder al servicio con su navegador.</translation> </message> @@ -2378,104 +2378,104 @@ No se recomienda usarla.</translation> <translation>URL inválida.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>La carpeta de sincronización local %1 ya existe, configurándola para la sincronización.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="427"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>Creando carpeta de sincronización local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>bien</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="433"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>ha fallado.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="435"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>No se ha podido crear la carpeta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>¡No se ha especificado ninguna carpeta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="480"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>creando carpeta en ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>Carpeta remota %1 creado correctamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La carpeta remota %1 ya existe. Conectándola para sincronizacion.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="502"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación de la carpeta ha producido el código de error HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="504"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>¡La creación de la carpeta remota ha fallado debido a que las credenciales proporcionadas son incorrectas!<br/>Por favor, vuelva atrás y compruebe sus credenciales</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">La creación de la carpeta remota ha fallado, probablemente porque las credenciales proporcionadas son incorrectas.</font><br/>Por favor, vuelva atrás y compruebe sus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Creación %1 de carpeta remota ha fallado con el error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Se ha configarado una conexión de sincronización desde %1 al directorio remoto %2</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>¡Conectado con éxito a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No se ha podido establecer la conexión con %1. Por favor, compruébelo de nuevo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Error al renombrar la carpeta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>No se puede eliminar y respaldar la carpeta porque la misma o un fichero en ella está abierto por otro programa. Por favor, cierre la carpeta o el fichero y reintente, o cancele la instalación.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="610"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Carpeta de sincronización local %1 creada con éxito</b></font></translation> </message> @@ -3889,7 +3889,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="357"/> + <location filename="../src/libsync/theme.cpp" line="382"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -3909,7 +3909,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <message> <location filename="../src/common/checksums.cpp" line="361"/> <source>The downloaded file does not match the checksum, it will be resumed. '%1' != '%2'</source> - <translation type="unfinished"/> + <translation>El archivo descargado no coincide con el archivo de comprobación, será reanudado.</translation> </message> </context> <context> @@ -4349,37 +4349,37 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>en el futuro</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>Hace %n día(s)</numerusform><numerusform>Hace %n día(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>Hace %n hora(s)</numerusform><numerusform>Hace %n hora(s)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>ahora</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>Hace menos de un minuto</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>Hace %n minutos(s)</numerusform><numerusform>Hace %n minutos(s)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>Hace algún tiempo</translation> </message> @@ -4464,15 +4464,15 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="332"/> + <location filename="../src/libsync/theme.cpp" line="360"/> <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> - <translation type="unfinished"/> + <translation>%1 %2 %3 %4%8%9Bibliotecas Qt %5, %6%8Usando plugin de archivos virtuales : %7</translation> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="322"/> + <location filename="../src/libsync/theme.cpp" line="350"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4480,7 +4480,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="327"/> + <location filename="../src/libsync/theme.cpp" line="355"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4588,52 +4588,52 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Estado indefinido</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>Esperando para comenzar la sincronización</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>Sincronizado en proceso</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Sincronizado con éxito</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>Sincronizado con éxito, algunos archivos han sido ignorados.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Error de sincronización.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Error en la instalación</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>Preparando para sincronizar</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>Cancelando...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>La sincronización está en pausa.</translation> </message> diff --git a/translations/client_fa.ts b/translations/client_fa.ts index ca6779167..f36354575 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -146,7 +146,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="131"/> + <location filename="../src/libsync/account.cpp" line="121"/> <source>%1@%2</source> <translation type="unfinished"/> </message> @@ -513,12 +513,12 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>1% روی 2%</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>1% روی 2% (قطع شده)</translation> </message> @@ -2062,7 +2062,7 @@ Note that using any logging command line options will override the settings.</so <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="295"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation type="unfinished"/> @@ -2073,21 +2073,21 @@ Note that using any logging command line options will override the settings.</so <translation><h1>خطای ورود</h1><p>1%</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="206"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="218"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="239"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>کاربر نادرست</h1><p> شما با کاربر<em>1%</em> وارد شدید، اما باید با کاربر <em>2%</em> وارد می شدید. <br> لطفا در برگه دیگری از 3% خارج شده، سپس <a href='%4'>اینجا را کلیک کنید</a> و به عنوان کاربر 2% وارد شوید</p></translation> </message> @@ -2342,17 +2342,17 @@ It is not advisable to use it.</source> <translation>تلاش برای اتصال %1 به %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>درخواست تایید شده به سرور '1%' هدایت شد. آدرس بد است، سرور اشتباه پیکربندی شده است.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>یک پاسخ نادرست به درخواست webdov تایید شده وجود داشت</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="370"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>دسترسی توسط سرور ممنوع شد. برای تأیید اینکه شما دسترسی مناسب دارید، <a href="%1">اینجا را کلیک کنید </a> تا با مرورگر خود به سرویس دسترسی پیدا کنید.</translation> </message> @@ -2362,104 +2362,104 @@ It is not advisable to use it.</source> <translation>آدرس نامعتبر</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>پوشه همگام سازی محلی %1 در حال حاضر موجود است، تنظیم آن برای همگام سازی. <br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="427"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>ساخت پوشه همگام سازی محلی 1%...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>خوب</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="433"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>ناموفق.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="435"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>نمی تواند پوشه محلی ایجاد کند %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>هیچ پوشه از راه دوری مشخص نشده است!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>خطا: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="480"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>ایجاد کردن پوشه بر روی ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>پوشه از راه دور %1 با موفقیت ایجاد شده است.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>در حال حاضر پوشه از راه دور %1 موجود است. برای همگام سازی به آن متصل شوید.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="502"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>ایجاد پوشه به خطای HTTP کد 1% منجر شد</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="504"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>ایجاد پوشه از راه دور ناموفق بود به علت اینکه اعتبارهای ارائه شده اشتباه هستند!<br/>لطفا اعتبارهای خودتان را بررسی کنید.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red"> ایجاد پوشه از راه دور ناموفق بود، شاید به علت اعتبارهایی که ارئه شده اند، اشتباه هستند.</font><br/> لطفا باز گردید و اعتبار خود را بررسی کنید.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>ایجاد پوشه از راه دور %1 ناموفق بود با خطا <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>یک اتصال همگام سازی از %1 تا %2 پوشه از راه دور راه اندازی شد.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>با موفقیت به %1 اتصال یافت!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>اتصال به %1 نمی تواند مقرر باشد. لطفا دوباره بررسی کنید.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>تغییر نام پوشه ناموفق بود</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>نمی توانید پوشه را حذف کنید یا پشتیبان بگیرید زیرا پوشه یا یک پرونده در آن در برنامه دیگری باز است. لطفا پوشه یا پرونده را ببندید و مجددا تلاش کنید یا تنظیم را لغو کنید.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="610"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b> پوشه همگام سازی محلی %1 با موفقیت ساخته شده است!</b></font></translation> </message> @@ -3864,7 +3864,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="357"/> + <location filename="../src/libsync/theme.cpp" line="382"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4324,37 +4324,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>در آینده</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>n% روز پیش</numerusform><numerusform>n% روز پیش</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>n% ساعت پیش</numerusform><numerusform>n% ساعت پیش</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>اکنون</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>کمتر از یک دقیقه پیش</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>n% دقیقه پیش</numerusform><numerusform>n% دقیقه پیش</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>چند وقت پیش</translation> </message> @@ -4439,7 +4439,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="332"/> + <location filename="../src/libsync/theme.cpp" line="360"/> <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> <translation type="unfinished"/> </message> @@ -4447,7 +4447,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="322"/> + <location filename="../src/libsync/theme.cpp" line="350"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4455,7 +4455,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="327"/> + <location filename="../src/libsync/theme.cpp" line="355"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4563,52 +4563,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>وضعیت نامشخص است</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>در حال انتظار برای شروع همگامسازی</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>همگام سازی در حال اجراست</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>همگامسازی با موفقیت انجام شد</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>همگامسازی موفق، تعداد از فایلها نادیده گرفته شدهاند.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>خطای همگامسازی</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>خطای نصب</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>آمادهسازی همگامسازی</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>همگامسازیی فعلا متوقف شده است</translation> </message> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 4e824266e..1a5760289 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -146,7 +146,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="131"/> + <location filename="../src/libsync/account.cpp" line="121"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -517,12 +517,12 @@ Cette action stoppera toute synchronisation en cours.</translation> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 sur %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 sur %2 (déconnecté)</translation> </message> @@ -2074,7 +2074,7 @@ Veuillez noter qu’utiliser les options de journalisation en ligne de commande <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="295"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation type="unfinished"/> @@ -2085,21 +2085,21 @@ Veuillez noter qu’utiliser les options de journalisation en ligne de commande <translation><h1>Erreur de connexion</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="206"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="218"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="239"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>Mauvais utilisateur</h1><p>Vous êtes connecté avec l'utilisateur <em>%1</em>, mais vous devez vous connecter avec l'utilisateur<em>%2</em>. Veuillez vous déconnecter de %3 l'autre onglet, puis <a href='%4'> cliquez ici</a> et connectez-vous en tant que l'utilisateur </p>%2</translation> </message> @@ -2355,17 +2355,17 @@ Il est déconseillé de l'utiliser.</translation> <translation>Tentative de connexion à %1 sur %2 ...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>La requête d'authentification vers le serveur a été redirigée vers '%1'. L'URL est erronée, le serveur est mal configuré.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>Une réponse non valide a été reçue suite à une requête WebDav authentifiée.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="370"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Accès impossibe. Afin de vérifier l'accès au serveur, <a href="%1">cliquez ici</a> et connectez-vous au service avec votre navigateur web.</translation> </message> @@ -2375,104 +2375,104 @@ Il est déconseillé de l'utiliser.</translation> <translation>URL invalide</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Le dossier de synchronisation local %1 existe déjà, configuration de la synchronisation.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="427"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>Création du dossier local de synchronisation %1... </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="433"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>échoué.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="435"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>Impossible de créer le dossier local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>Aucun dossier distant spécifié !</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Erreur : %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="480"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>création d'un dossier sur ownCloud : %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>Le dossier distant %1 a été créé avec succès.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Le dossier distant %1 existe déjà. Connexion.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="502"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La création du dossier a généré le code d'erreur HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="504"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>La création du dossier distant a échoué car les identifiants de connexion sont erronés !<br/>Veuillez revenir en arrière et vérifier ces derniers.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">La création du dossier distant a échoué, probablement parce que les informations d'identification fournies sont fausses.</font><br/>Veuillez revenir en arrière et les vérifier.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>La création du dossier distant "%1" a échouée avec l'erreur <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Une synchronisation entre le dossier local %1 et le dossier distant %2 a été configurée.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>Connecté avec succès à %1 !</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>La connexion à %1 n'a pu être établie. Veuillez réessayer.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Echec du renommage du dossier</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Impossible de supprimer et de sauvegarder le dossier parce que ce dossier ou un de ses fichiers est ouvert dans un autre programme. Veuillez fermer le dossier ou le fichier et ré-essayer, ou annuler l'installation.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="610"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Dossier de synchronisation local %1 créé avec succès !</b></font></translation> </message> @@ -3879,7 +3879,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="357"/> + <location filename="../src/libsync/theme.cpp" line="382"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4339,37 +4339,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>Dans le futur</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>Hier</numerusform><numerusform>Il y a %n jours</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>Il y a %n heure</numerusform><numerusform>Il y a %n heures</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>maintenant</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>Il y a moins d'une minute</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>Il y a %n minute</numerusform><numerusform>Il y a %n minutes</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>Il y a quelque temps</translation> </message> @@ -4454,7 +4454,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="332"/> + <location filename="../src/libsync/theme.cpp" line="360"/> <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> <translation type="unfinished"/> </message> @@ -4462,7 +4462,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="322"/> + <location filename="../src/libsync/theme.cpp" line="350"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4470,7 +4470,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="327"/> + <location filename="../src/libsync/theme.cpp" line="355"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4578,52 +4578,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Statut indéfini</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>Synchronisation en attente</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>Synchronisation en cours</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Synchronisation réussie</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>Synchronisation terminée avec succès, certains fichiers ont été ignorés.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Erreur de synchronisation</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Erreur de configuration</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>Préparation à la synchronisation</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>Annulation...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>La synchronisation est en pause</translation> </message> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 13880de74..0ac69ae96 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -146,7 +146,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="131"/> + <location filename="../src/libsync/account.cpp" line="121"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -517,12 +517,12 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.< <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 en %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 en %2 (desconectado)</translation> </message> @@ -2078,7 +2078,7 @@ Teña en conta que o uso de calquera opción de rexistro por liña de ordes anul <translation><h1>Produciuse un erro de acceso</h1><p>Produciuse un fallo ao recuperar a información do usuario</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="295"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation> Erro: Falta o campo %1 @@ -2090,14 +2090,14 @@ Teña en conta que o uso de calquera opción de rexistro por liña de ordes anul <translation><h1>Produciuse un erro de acceso</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="206"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation>Produciuse un erro ao eliminar o testemuño: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="218"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2106,7 +2106,7 @@ Received data: %2</source> Datos recibidos: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="239"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>Usuario errado</h1><p>Accedeu co usuario <em>%1</em>, mais debe acceder co usuario <em>%2</em>.<br>Peche a sesión de %3 noutra lapela, entón <a href='%4'>prema aquí</a> e acceda como o usuario %2</p></translation> </message> @@ -2196,7 +2196,7 @@ actualización pode pedir privilexios adicionais durante o procedemento.</transl <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> <source>Use &virtual files instead of downloading content immediately%1</source> - <translation type="unfinished"/> + <translation>Usar ficheiros &virtuais, no canto de descargar o contido inmediatamente%1</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> @@ -2362,17 +2362,17 @@ Recomendámoslle que non o use.</translation> <translation>Tentando conectarse a %1 en %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>A solicitude autenticada no servidor foi redirixida a «%1», O URL é incorrecto, o servidor está mal configurado.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>Deuse unha resposta incorrecta a unha solicitude de WebDAV autenticada</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="370"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Acceso prohibido polo servidor. Para comprobar que dispón do acceso axeitado, <a href="%1">prema aquí</a> para acceder ao servizo co seu navegador.</translation> </message> @@ -2382,104 +2382,104 @@ Recomendámoslle que non o use.</translation> <translation>URL incorrecto</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>O cartafol de sincronización local %1 xa existe. Configurándoo para a sincronización.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="427"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>Creando un cartafol local de sincronización %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>aceptar</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="433"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>fallou.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="435"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>Non foi posíbel crear o cartafol local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>Non foi especificado o cartafol remoto!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="480"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>creando o cartafol en ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>O cartafol remoto %1 creouse correctamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>O cartafol remoto %1 xa existe. Conectándoo para a sincronización.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="502"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>A creación do cartafol resultou nun código de erro HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="504"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>A creación do cartafol remoto fracasou por mor de seren incorrectas as credenciais!<br/>Volva atrás e comprobe as súas credenciais.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">A creación do cartafol remoto fallou probabelmente debido a que as credenciais que se deron non foran as correctas.</font><br/>Volva atrás e comprobe as súas credenciais.</p> </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Produciuse un fallo ao crear o cartafol remoto %1 e dou o erro <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Estabeleceuse a conexión de sincronización de %1 ao directorio remoto %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>Conectou satisfactoriamente con %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Non foi posíbel estabelecer a conexión con %1. Compróbeo de novo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Non foi posíbel renomear o cartafol</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Non é posíbel retirar e facer unha copia de seguridade do cartafol, xa que o cartafol ou un ficheiro está aberto noutro programa Peche o cartafol ou o ficheiro e ténteo de novo, ou cancele a acción.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="610"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>O cartafol local de sincronización %1 creouse correctamente!</b></font></translation> </message> @@ -3893,7 +3893,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="357"/> + <location filename="../src/libsync/theme.cpp" line="382"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation><p>Version %1. Para obter máis información visite<a href="%2">https://%3</a></p><p>Para incidentes coñecidos e axuda, visite: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, e outros.</small></p><p>Copyright ownCloud GmbH</p><p>Distribuído por %4 e licenciado baixo a Licenza Pública Xeral (GPL) de GNU Versión 2.0.<br/>%5 e o logotipo de %5 son marcas rexistradas de %4 nos Estados Unidos, noutros países ou en ambos.</p><p><small>%6</small></p></translation> </message> @@ -4353,37 +4353,37 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>no futuro</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>vai %n día</numerusform><numerusform>vai %n días</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>vai %n hora</numerusform><numerusform>vai %n horas</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>agora</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>Vai menos dun minuto</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>vai %n minuto</numerusform><numerusform>vai %n minutos</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>Vai algún tempo</translation> </message> @@ -4468,7 +4468,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="332"/> + <location filename="../src/libsync/theme.cpp" line="360"/> <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> <translation>%1 %2 %3 %4%8%9Bibliotecas Qt %5, %6%8Usando un complemento de ficheiros virtuais: %7</translation> </message> @@ -4476,7 +4476,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="322"/> + <location filename="../src/libsync/theme.cpp" line="350"/> <source>%1 (Built against Qt %1)</source> <translation>%1 (Construído sobre Qt %1)</translation> </message> @@ -4484,7 +4484,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="327"/> + <location filename="../src/libsync/theme.cpp" line="355"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4592,52 +4592,52 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Estado sen definir</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>Agardando o comezo da sincronización</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>Sincronización en proceso</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Sincronización realizada</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>A sincronización foi correcta, algúns ficheiros foron ignorados.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Produciuse un erro de sincronización</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Erro de configuración</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>Preparando para sincronizar</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>Cancelando...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>Sincronización en pausa</translation> </message> diff --git a/translations/client_it.ts b/translations/client_it.ts index f733c24ea..5a1e9f0f4 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -146,7 +146,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="131"/> + <location filename="../src/libsync/account.cpp" line="121"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -517,12 +517,12 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 su %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 su %2 (disconnesso)</translation> </message> @@ -2075,7 +2075,7 @@ Note that using any logging command line options will override the settings.</so <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="295"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation type="unfinished"/> @@ -2086,21 +2086,21 @@ Note that using any logging command line options will override the settings.</so <translation><h1>Errore di login</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="206"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="218"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="239"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>Utente errato</h1><p>Sei entrato con l'utente <em>%1</em>, ma devi accedere con <em>%2</em>.<br>Disconnettiti da %3 in un'altra scheda, poi <a href='%4'>clicca qui</a> e accedi come utente %2</p></translation> </message> @@ -2355,17 +2355,17 @@ Non è consigliabile utilizzarlo.</translation> <translation>Tentativo di connessione a %1 su %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>La richiesta autenticata al server è stata rediretta a '%1'. L'URL è errato, il server non è configurato correttamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>Ricevuta una risposta non valida a una richiesta webdav autenticata.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="370"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Accesso negato dal server. Per verificare di avere i permessi appropriati, <a href="%1">fai clic qui</a> per accedere al servizio con il tuo browser.</translation> </message> @@ -2375,104 +2375,104 @@ Non è consigliabile utilizzarlo.</translation> <translation>URL non valido</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>La cartella di sincronizzazione locale %1 esiste già, impostata per la sincronizzazione.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="427"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>Creazione della cartella locale di sincronizzazione %1... </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="433"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>non riuscita.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="435"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>Impossibile creare la cartella locale %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>Nessuna cartella remota specificata!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Errore: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="480"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>creazione cartella su ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>La cartella remota %1 è stata creata correttamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La cartella remota %1 esiste già. Connessione in corso per la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="502"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creazione della cartella ha restituito un codice di errore HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="504"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>La creazione della cartella remota non è riuscita poiché le credenziali fornite sono errate!<br/>Torna indietro e verifica le credenziali.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">La creazione della cartella remota non è riuscita probabilmente perché le credenziali fornite non sono corrette.</font><br/>Torna indietro e controlla le credenziali inserite.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Creazione della cartella remota %1 non riuscita con errore <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Una connessione di sincronizzazione da %1 alla cartella remota %2 è stata stabilita.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>Connesso con successo a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>La connessione a %1 non può essere stabilita. Prova ancora.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Rinomina della cartella non riuscita</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Impossibile rimuovere o creare una copia di sicurezza della cartella poiché la cartella o un file in essa contenuto è aperta in un altro programma. Chiudi la cartella o il file e premi Riprova o annulla la configurazione.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="610"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Cartella locale %1 creata correttamente!</b></font></translation> </message> @@ -3886,7 +3886,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="357"/> + <location filename="../src/libsync/theme.cpp" line="382"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4346,37 +4346,37 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>nel futuro</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>%n giorno fa</numerusform><numerusform>%n giorni fa</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>%n ora fa</numerusform><numerusform>%n ore fa</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>adesso</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>Meno di un minuto fa</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>%n minuto fa</numerusform><numerusform>%n minuti fa</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>Tempo fa</translation> </message> @@ -4461,7 +4461,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="332"/> + <location filename="../src/libsync/theme.cpp" line="360"/> <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> <translation type="unfinished"/> </message> @@ -4469,7 +4469,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="322"/> + <location filename="../src/libsync/theme.cpp" line="350"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4477,7 +4477,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="327"/> + <location filename="../src/libsync/theme.cpp" line="355"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4585,52 +4585,52 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Stato non definito</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>In attesa di sincronizzazione</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>La sincronizzazione è in corso</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Sincronizzazione completata</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>Sincronizzazione avvenuta, alcuni file sono stati ignorati.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Errore di sincronizzazione</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Errore di configurazione</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>Preparazione della sincronizzazione</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>Interruzione in corso...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>La sincronizzazione è sospesa</translation> </message> diff --git a/translations/client_ja.ts b/translations/client_ja.ts index 61bb075bf..201ed4b2c 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -87,22 +87,45 @@ <translation>フォーム</translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="58"/> + <location filename="../src/gui/notificationwidget.ui" line="73"/> <source>Lorem ipsum dolor sit amet</source> <translation>Lorem ipsum dolor sit amet</translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="71"/> + <location filename="../src/gui/notificationwidget.ui" line="86"/> <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source> <translation>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="91"/> + <location filename="../src/gui/notificationwidget.ui" line="106"/> <source>TextLabel</source> <translation>テキストラベル</translation> </message> </context> <context> + <name>OCC::AboutDialog</name> + <message> + <location filename="../src/gui/aboutdialog.ui" line="24"/> + <source>About</source> + <translation>バージョン情報</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.ui" line="88"/> + <source>TextLabel</source> + <translation>テキストラベル</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.ui" line="96"/> + <source>Versions</source> + <translation>バージョン</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.cpp" line="28"/> + <source>About %1</source> + <translation>%1 について</translation> + </message> +</context> +<context> <name>OCC::AbstractNetworkJob</name> <message> <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> @@ -121,6 +144,14 @@ </message> </context> <context> + <name>OCC::Account</name> + <message> + <location filename="../src/libsync/account.cpp" line="121"/> + <source>%1@%2</source> + <translation>%1@%2</translation> + </message> +</context> +<context> <name>OCC::AccountSettings</name> <message> <location filename="../src/gui/accountsettings.ui" line="14"/> @@ -169,9 +200,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="512"/> - <location filename="../src/gui/accountsettings.cpp" line="625"/> - <location filename="../src/gui/accountsettings.cpp" line="1083"/> + <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="611"/> + <location filename="../src/gui/accountsettings.cpp" line="1048"/> <source>Cancel</source> <translation>キャンセル</translation> </message> @@ -181,87 +212,67 @@ <translation><server> に <user> で接続中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="180"/> <source>No account configured.</source> <translation>アカウントが未設定です。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="200"/> - <source>Add new</source> - <translation>新規追加</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="209"/> + <location filename="../src/gui/accountsettings.cpp" line="203"/> <source>Remove</source> <translation>削除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="213"/> + <location filename="../src/gui/accountsettings.cpp" line="207"/> <source>Account</source> <translation>アカウント</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="297"/> <source>Choose what to sync</source> <translation>同期フォルダーを選択</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Force sync now</source> <translation>今すぐ強制的に同期</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="305"/> <source>Restart sync</source> <translation>同期を再実行</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="327"/> + <location filename="../src/gui/accountsettings.cpp" line="314"/> <source>Remove folder sync connection</source> <translation>同期フォルダー接続を削除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>Enable virtual file support %1...</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>(tech preview)</source> - <translation>（技術プレビュー）</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>(experimental)</source> - <translation>（実験的）</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="445"/> + <location filename="../src/gui/accountsettings.cpp" line="433"/> <source>Folder creation failed</source> <translation>フォルダーの作成に失敗しました</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="434"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>ローカルフォルダー <i>%1</i> を作成できません。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="504"/> + <location filename="../src/gui/accountsettings.cpp" line="491"/> <source>Confirm Folder Sync Connection Removal</source> <translation>同期フォルダー接続の削除を確認</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="511"/> + <location filename="../src/gui/accountsettings.cpp" line="499"/> <source>Remove Folder Sync Connection</source> <translation>同期フォルダー接続を削除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="616"/> + <location filename="../src/gui/accountsettings.cpp" line="602"/> <source>Disable virtual file support?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="617"/> + <location filename="../src/gui/accountsettings.cpp" line="603"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -270,173 +281,183 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="624"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Disable support</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="734"/> + <location filename="../src/gui/accountsettings.cpp" line="712"/> <source>Sync Running</source> <translation>同期を実行中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="735"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>同期作業を実行中です。<br/>終了しますか？</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="830"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>%1 in use</source> <translation>%1 を使用中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="857"/> + <location filename="../src/gui/accountsettings.cpp" line="836"/> <source>%1 as <i>%2</i></source> <translation><i>%2</i> の %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="866"/> + <location filename="../src/gui/accountsettings.cpp" line="845"/> <source>Connected to %1.</source> <translation>%1 に接続</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="871"/> + <location filename="../src/gui/accountsettings.cpp" line="850"/> <source>Server %1 is temporarily unavailable.</source> <translation>サーバー %1 は一時的に利用できません</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="874"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is currently in maintenance mode.</source> <translation>サーバー %1 は現在メンテナンスモードです。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="877"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Signed out from %1.</source> <translation>%1 からサインアウトしました。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="887"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Connecting to %1...</source> <translation>%1 に接続中...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="871"/> <source>No connection to %1 at %2.</source> <translation>%2 の %1 への接続がありません。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="910"/> <source>Log in</source> <translation>ログイン</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1026"/> + <location filename="../src/gui/accountsettings.cpp" line="1005"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>大きすぎるため同期されなかったフォルダーがあります:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1028"/> + <location filename="../src/gui/accountsettings.cpp" line="1007"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>外部ストレージにあるため同期されなかったフォルダーがあります:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1029"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>大きすぎたか、外部ストレージにあるため同期されなかったフォルダーがあります:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1075"/> + <location filename="../src/gui/accountsettings.cpp" line="1041"/> <source>Confirm Account Removal</source> <translation>アカウント削除確認</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1076"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p> アカウント <i>%1</i> を本当に削除しますか?</p><p><b>注意:</b> これによりファイルが一切削除されることはありません。</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1082"/> + <location filename="../src/gui/accountsettings.cpp" line="1047"/> <source>Remove connection</source> <translation>接続削除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="306"/> + <location filename="../src/gui/accountsettings.cpp" line="293"/> <source>Open folder</source> <translation>フォルダーを開く</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="205"/> - <location filename="../src/gui/accountsettings.cpp" line="933"/> + <location filename="../src/gui/accountsettings.cpp" line="199"/> + <location filename="../src/gui/accountsettings.cpp" line="912"/> <source>Log out</source> <translation>ログアウト</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="265"/> + <location filename="../src/gui/accountsettings.cpp" line="252"/> <source>Open local folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="273"/> + <location filename="../src/gui/accountsettings.cpp" line="260"/> <source>Open folder in browser</source> <translation>フォルダをブラウザで開く</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="324"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Resume sync</source> <translation>再開</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="324"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Pause sync</source> <translation>一時停止</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="331"/> + <location filename="../src/gui/accountsettings.cpp" line="318"/> <source>Availability</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="348"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source>Disable virtual file support...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="505"/> + <location filename="../src/gui/accountsettings.cpp" line="343"/> + <source>Enable virtual file support%1...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="343"/> + <source> (experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="492"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>フォルダー<i>%1</i>の同期を本当に止めますか？</p><p><b>注:</b> これによりファイルが一切削除されることはありません。</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="817"/> + <location filename="../src/gui/accountsettings.cpp" line="796"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%2 の %1(%3%) 利用中。外部ネットワークストレージや共有フォルダーを含むフォルダーがある場合は、容量の上限値が異なる可能性があります。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="818"/> + <location filename="../src/gui/accountsettings.cpp" line="797"/> <source>%1 of %2 in use</source> <translation>%2 のうち %1 を使用中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="827"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Currently there is no storage usage information available.</source> <translation>現在、利用できるストレージ利用状況はありません。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="864"/> + <location filename="../src/gui/accountsettings.cpp" line="843"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="884"/> + <location filename="../src/gui/accountsettings.cpp" line="863"/> <source>Obtaining authorization from the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="897"/> + <location filename="../src/gui/accountsettings.cpp" line="876"/> <source>Server configuration error: %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="908"/> + <location filename="../src/gui/accountsettings.cpp" line="887"/> <source>No %1 connection configured.</source> <translation>%1 の接続は設定されていません。</translation> </message> @@ -492,12 +513,12 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%2 中 %1</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%2 中 %1 (切断しました)</translation> </message> @@ -513,44 +534,44 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="515"/> - <location filename="../src/gui/activitywidget.cpp" line="563"/> + <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="570"/> <source>Server Activity</source> <translation>サーバーアクティビティ</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>同期状況</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>同期対象外</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="574"/> + <location filename="../src/gui/activitywidget.cpp" line="581"/> <source>Not Synced (%1)</source> <extracomment>%1 is the number of not synced files.</extracomment> <translation>未同期 (%1)</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="606"/> + <location filename="../src/gui/activitywidget.cpp" line="613"/> <source>The server activity list has been copied to the clipboard.</source> <translation>サーバーアクティビティリストをクリップボードにコピーしました。</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="610"/> + <location filename="../src/gui/activitywidget.cpp" line="617"/> <source>The sync activity list has been copied to the clipboard.</source> <translation>同期状況をクリップボードにコピーしました。</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="613"/> + <location filename="../src/gui/activitywidget.cpp" line="620"/> <source>The list of unsynced items has been copied to the clipboard.</source> <translation>同期されていないアイテムのリストがクリップボードにコピーされました。</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="618"/> + <location filename="../src/gui/activitywidget.cpp" line="625"/> <source>Copied to clipboard</source> <translation>クリップボードにコピー</translation> </message> @@ -570,47 +591,47 @@ This action will abort any currently running synchronization.</source> <translation>テキストラベル</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>サーバーアクティビティ</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>コピー</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="93"/> + <location filename="../src/gui/activitywidget.cpp" line="100"/> <source>Copy the activity list to the clipboard.</source> <translation>アクティビティ一覧をコピーする</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>通知</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="351"/> + <location filename="../src/gui/activitywidget.cpp" line="358"/> <source>%n notifications(s) for %1.</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="357"/> + <location filename="../src/gui/activitywidget.cpp" line="364"/> <source>%n notifications(s) for %1 and %2.</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="359"/> + <location filename="../src/gui/activitywidget.cpp" line="366"/> <source>New notifications for %1, %2 and other accounts.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="362"/> + <location filename="../src/gui/activitywidget.cpp" line="369"/> <source>Open the activity view for details.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="145"/> + <location filename="../src/gui/activitywidget.cpp" line="152"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>%1 アカウントは、 アクティビティを有効にしていません。</translation> </message> @@ -661,42 +682,42 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="134"/> + <location filename="../src/gui/application.cpp" line="136"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="138"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="142"/> + <location filename="../src/gui/application.cpp" line="144"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="149"/> + <location filename="../src/gui/application.cpp" line="151"/> <source>Quit</source> <translation>終了</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="150"/> + <location filename="../src/gui/application.cpp" line="152"/> <source>Continue</source> <translation>続ける</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="299"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Error accessing the configuration file</source> <translation>設定ファイルのアクセスでエラーが発生しました</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="300"/> + <location filename="../src/gui/application.cpp" line="310"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>設定ファイルの %1 行目にアクセスしている時にエラーが発生しました。</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="303"/> + <location filename="../src/gui/application.cpp" line="313"/> <source>Quit ownCloud</source> <translation>ownCloudを終了</translation> </message> @@ -727,7 +748,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1135"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1140"/> <source>Error writing metadata to the database</source> <translation>メタデータのデータベースへの書き込みに失敗</translation> </message> @@ -805,135 +826,135 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="172"/> + <location filename="../src/gui/folder.cpp" line="173"/> <source>Local folder %1 does not exist.</source> <translation>ローカルフォルダー %1 は存在しません。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="175"/> + <location filename="../src/gui/folder.cpp" line="176"/> <source>%1 should be a folder but is not.</source> <translation>%1 はフォルダーのはずですが、そうではないようです。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="178"/> + <location filename="../src/gui/folder.cpp" line="179"/> <source>%1 is not readable.</source> <translation>%1 は読み込み可能ではありません。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 は削除されました。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 が更新されました。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 の名前が %2 に変更されました。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2.</source> <translation>%1 は %2 に移動しました。</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="414"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 とその他 %n 個のファイルが削除されました。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="420"/> + <location filename="../src/gui/folder.cpp" line="421"/> <source>%1 and %n other file(s) have been added.</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="427"/> + <location filename="../src/gui/folder.cpp" line="428"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 とその他 %n 個のファイルが更新されました。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="434"/> + <location filename="../src/gui/folder.cpp" line="435"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 を %2 にファイル名を変更し、その他 %n 個のファイル名を変更しました。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="441"/> + <location filename="../src/gui/folder.cpp" line="442"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 を %2 に移動し、その他 %n 個のファイルを移動しました。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="448"/> + <location filename="../src/gui/folder.cpp" line="449"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 と その他 %n 個のファイルが同期で衝突しました。</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 が同期で衝突しています。コンフリクトファイルを確認してください。</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="455"/> + <location filename="../src/gui/folder.cpp" line="456"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>エラーにより、%1 と その他 %n 個のファイルが同期できませんでした。ログで詳細を確認してください。</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>エラーにより %1 が未同期です。ログで詳細を確認してください。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="463"/> + <location filename="../src/gui/folder.cpp" line="464"/> <source>Sync Activity</source> <translation>同期アクティビティ</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="800"/> <source>Could not read system exclude file</source> <translation>システム上の除外ファイルを読み込めません</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1045"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>%1 MB より大きな新しいフォルダーが追加されました: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>A folder from an external storage has been added. </source> <translation>外部ストレージからフォルダーが追加されました。 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1049"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>このフォルダーをダウンロードするには設定画面で選択してください。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1109"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1112"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <source>Changes in synchronized folders could not be tracked reliably. This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default). @@ -942,7 +963,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1208"/> + <location filename="../src/gui/folder.cpp" line="1197"/> <source>All files in the sync folder '%1' folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to keep the files, they will be re-synced with the server if you have rights to do so. @@ -953,7 +974,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a 「すべてのファイルを削除」を選択すると、あなたが所有者でない限り、ファイルは使用できなくなります。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1202"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -962,17 +983,17 @@ If this was an accident and you decide to keep your files, they will be re-synce 「ファイルを残す」を選択した場合、ファイルはサーバーから再同期されます。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1217"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>すべてのファイルを削除しますか？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>すべてのファイルを削除</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>ファイルを残す</translation> </message> @@ -980,107 +1001,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="357"/> <source>Could not reset folder state</source> <translation>フォルダーの状態をリセットできませんでした</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="356"/> + <location filename="../src/gui/folderman.cpp" line="358"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>古い同期ジャーナル '%1' が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation>(バックアップ)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation>(%1をバックアップ)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Undefined State.</source> <translation>未定義の状態。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1332"/> <source>Waiting to start syncing.</source> <translation>同期開始を待機中</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>Preparing for sync.</source> <translation>同期の準備中。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1336"/> + <location filename="../src/gui/folderman.cpp" line="1338"/> <source>Sync is running.</source> <translation>同期を実行中です。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync was successful, unresolved conflicts.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1343"/> + <location filename="../src/gui/folderman.cpp" line="1345"/> <source>Last Sync was successful.</source> <translation>最後の同期は成功しました。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>設定エラー。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>ユーザーによる中止。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>Sync is paused.</source> <translation>同期を一時停止しました。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1361"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>%1 (Sync is paused)</source> <translation>%1 (同期を一時停止)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1369"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <source>No valid folder selected!</source> <translation>有効なフォルダーが選択されていません！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path does not exist!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1382"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>The selected path is not a folder!</source> <translation>指定のパスは、フォルダーではありません！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1391"/> <source>You have no permission to write to the selected folder!</source> <translation>選択されたフォルダーに書き込み権限がありません</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1456"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>すでに同期されたフォルダーがあります。別のフォルダーを選択してください！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1436"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>ローカルフォルダー %1 にはすでに同期フォルダーとして利用されてるフォルダーを含んでいます。他のフォルダーを選択してください。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1442"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>ローカルフォルダー %1 には同期フォルダーとして利用されているフォルダーがあります。他のフォルダーを選択してください。</translation> </message> @@ -1088,16 +1109,11 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderStatusDelegate</name> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="47"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="46"/> <source>Add Folder Sync Connection</source> <translation>同期フォルダーを追加</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="248"/> - <source>Synchronizing with local folder</source> - <translation>ローカルフォルダーを同期中</translation> - </message> - <message> <location filename="../src/gui/folderstatusdelegate.cpp" line="299"/> <source>File</source> <translation>ファイル</translation> @@ -1148,107 +1164,117 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>未解決の競合があります。クリックで詳細。</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="897"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <source>Synchronizing VirtualFiles with local folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <source>Synchronizing with local folder</source> + <translation>ローカルフォルダーを同期中</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="901"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="908"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="943"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="946"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>同期中 %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>ダウンロード %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="986"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>アップロード %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%4 中 %3 完了)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1015"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>残り%5、%2中%1完了 、ファイル%4個中%3個完了</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1023"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 of %2, ファイル数 %3 of %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1030"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> <source>file %1 of %2</source> <translation>%1 / %2 ファイル</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> <source>Waiting...</source> <translation>待機中...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>%n 他のフォルダーの完了待ち...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> <source>Preparing to sync...</source> <translation>同期の準備中...</translation> </message> @@ -1272,12 +1298,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="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Folder Sync Connection</source> <translation>同期フォルダーを追加</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="576"/> + <location filename="../src/gui/folderwizard.cpp" line="578"/> <source>Add Sync Connection</source> <translation>同期接続を追加</translation> </message> @@ -1285,17 +1311,17 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="68"/> + <location filename="../src/gui/folderwizard.cpp" line="69"/> <source>Click to select a local folder to sync.</source> <translation>同期したいローカルフォルダーをクリックしてください。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="75"/> + <location filename="../src/gui/folderwizard.cpp" line="76"/> <source>Enter the path to the local folder.</source> <translation>ローカルフォルダーのパスを入力してください。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="136"/> + <location filename="../src/gui/folderwizard.cpp" line="137"/> <source>Select the source folder</source> <translation>ソースフォルダーを選択</translation> </message> @@ -1303,52 +1329,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="184"/> + <location filename="../src/gui/folderwizard.cpp" line="185"/> <source>Create Remote Folder</source> <translation>リモートフォルダーを追加</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="185"/> + <location filename="../src/gui/folderwizard.cpp" line="186"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation> '%1'の下に新しいフォルダーの名前を入力:</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="215"/> + <location filename="../src/gui/folderwizard.cpp" line="216"/> <source>Folder was successfully created on %1.</source> <translation>%1 にフォルダーが作成されました。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="226"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Authentication failed accessing %1</source> <translation>%1 アクセス中に認証に失敗しました</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="228"/> + <location filename="../src/gui/folderwizard.cpp" line="229"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>%1 にフォルダーを作成できませんでした。手作業で確認してください。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="247"/> <source>Failed to list a folder. Error: %1</source> <translation>フォルダーをリストアップできません。エラー: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="328"/> <source>Choose this to sync the entire account</source> <translation>アカウント全体を同期する場合はこちらを選択</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="440"/> <source>This folder is already being synced.</source> <translation>このフォルダーはすでに同期されています。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="442"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation><i>%1</i>は、<i>%2</i>の親フォルダーですでに同期しています。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="444"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1356,30 +1382,30 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> - <source>Use virtual files instead of downloading content immediately %1</source> + <location filename="../src/gui/folderwizard.cpp" line="485"/> + <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="489"/> - <source>(tech preview)</source> - <translation>（技術プレビュー）</translation> + <location filename="../src/gui/folderwizard.cpp" line="485"/> + <source> (experimental)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="489"/> - <source>(experimental)</source> - <translation>（実験的）</translation> + <location filename="../src/gui/folderwizard.cpp" line="519"/> + <source>Virtual files are not available for the selected folder</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="49"/> + <location filename="../src/gui/folderwizard.cpp" line="50"/> <source><b>Warning:</b> %1</source> <translation><b>警告:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="51"/> + <location filename="../src/gui/folderwizard.cpp" line="52"/> <source><b>Warning:</b></source> <translation><b>警告:</b> </translation> </message> @@ -1428,48 +1454,73 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>一般設定</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="55"/> - <source>For System Tray</source> - <translation>システムトレイ</translation> + <location filename="../src/gui/generalsettings.ui" line="80"/> + <source>Sync hidden files</source> + <translation>隠しファイルを同期</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="109"/> + <source>Log Settings</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="184"/> + <location filename="../src/gui/generalsettings.ui" line="136"/> + <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="196"/> <source>Network</source> <translation>ネットワーク</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="257"/> + <location filename="../src/gui/generalsettings.ui" line="208"/> + <source>Updates</source> + <translation>アップデート</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="237"/> <source>stable</source> <translation>安定</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="262"/> + <location filename="../src/gui/generalsettings.ui" line="242"/> <source>beta</source> <translation>ベータ</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="68"/> + <location filename="../src/gui/generalsettings.ui" line="337"/> + <source>About</source> + <translation>バージョン情報</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="65"/> <source>Advanced</source> <translation>詳細設定</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="100"/> + <location filename="../src/gui/generalsettings.ui" line="41"/> + <source>Use &Monochrome Icons in the system tray</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="144"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>指定された容量以上のフォルダーは同期前に確認する</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="120"/> + <location filename="../src/gui/generalsettings.ui" line="164"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="186"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>外部ストレージと同期する前に確認する</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="41"/> + <location filename="../src/gui/generalsettings.ui" line="55"/> <source>&Launch on System Startup</source> <translation>システム開始時に起動(&L)</translation> </message> @@ -1479,69 +1530,54 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>デスクトップに通知を表示(&D)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="58"/> - <source>Use &Monochrome Icons</source> - <translation>モノクロアイコンを使用(&M)</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="213"/> - <source>Version</source> - <translation>バージョン</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="240"/> + <location filename="../src/gui/generalsettings.ui" line="220"/> <source>&Update Channel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="346"/> - <source>•</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="76"/> + <location filename="../src/gui/generalsettings.ui" line="102"/> <source>Edit &Ignored Files</source> <translation>除外ファイルリストを編集(&I)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="155"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="172"/> + <location filename="../src/gui/generalsettings.ui" line="93"/> <source>S&how crash reporter</source> <translation>クラッシュ報告を表示(&H)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="289"/> + <location filename="../src/gui/generalsettings.ui" line="269"/> <source>&Restart && Update</source> <translation>再起動してアップデート(&R)</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="266"/> + <location filename="../src/gui/generalsettings.cpp" line="280"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="176"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>Change update channel?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="177"/> + <location filename="../src/gui/generalsettings.cpp" line="191"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="190"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Change update channel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="205"/> <source>Cancel</source> <translation>キャンセル</translation> </message> @@ -1578,63 +1614,53 @@ Note that this selects only what pool upgrades are taken from, and that there ar </message> <message> <location filename="../src/gui/ignorelisteditor.ui" line="20"/> - <source>Global Ignore Settings</source> - <translation>全体的な除外設定</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.ui" line="26"/> - <source>Sync hidden files</source> - <translation>隠しファイルを同期</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.ui" line="36"/> <source>Files Ignored by Patterns</source> <translation>パターンによって除外するファイル</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="75"/> + <location filename="../src/gui/ignorelisteditor.ui" line="59"/> <source>Add</source> <translation>追加</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="57"/> + <location filename="../src/gui/ignorelisteditor.ui" line="41"/> <source>Pattern</source> <translation>パターン</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="62"/> + <location filename="../src/gui/ignorelisteditor.ui" line="46"/> <source>Allow Deletion</source> <translation>削除を許可</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="85"/> + <location filename="../src/gui/ignorelisteditor.ui" line="69"/> <source>Remove</source> <translation>削除</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="121"/> + <location filename="../src/gui/ignorelisteditor.ui" line="105"/> <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"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="119"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="112"/> <source>Could not open file</source> <translation>ファイルが開けませんでした</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="120"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="113"/> <source>Cannot write changes to '%1'.</source> <translation>'%1'を更新できません。</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="146"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="132"/> <source>Add Ignore Pattern</source> <translation>除外するファイルパターンを追加</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="147"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> <source>Add a new ignore pattern:</source> <translation>除外するファイルパターンを新しく追加:</translation> </message> @@ -1735,35 +1761,54 @@ Items where deletion is allowed will be deleted if they prevent a directory from <context> <name>OCC::LogBrowser</name> <message> - <location filename="../src/gui/logbrowser.cpp" line="46"/> + <location filename="../src/gui/logbrowser.ui" line="14"/> <source>Log Output</source> <translation>ログ出力</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="52"/> + <location filename="../src/gui/logbrowser.ui" line="116"/> + <source>Enable logging to temporary folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="61"/> + <source>Delete logs older than %1 hours</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="53"/> + <source><html><head/><body><p><span style=" font-weight:600; color:#ff0000;">The logs contain sensitive information which you should not make publicly available</span></p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="71"/> <source>The client can write debug logs to a temporary folder. These logs are very helpful for diagnosing problems. -Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space. -If enabled, logs will be written to %1</source> +Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="66"/> - <source>Enable logging to temporary folder</source> + <location filename="../src/gui/logbrowser.ui" line="84"/> + <source>If enabled, logs will be written to:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> - <source>Delete logs older than %1 hours</source> + <location filename="../src/gui/logbrowser.ui" line="91"/> + <source>C:/log</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="123"/> + <source>Log Http traffic </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.ui" line="143"/> <source>These settings persist across client restarts. Note that using any logging command line options will override the settings.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="85"/> + <location filename="../src/gui/logbrowser.ui" line="154"/> <source>Open folder</source> <translation>フォルダーを開く</translation> </message> @@ -1771,12 +1816,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="186"/> + <location filename="../src/libsync/logger.cpp" line="177"/> <source>Error</source> <translation>エラー</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="187"/> + <location filename="../src/libsync/logger.cpp" line="178"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>ファイル '%1'<br/>を書き込み用で開けませんでした。<br/><br/>ログ出力を<b>保存できません</b>でした！</nobr></translation> </message> @@ -1951,23 +1996,23 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NotificationWidget</name> <message> - <location filename="../src/gui/notificationwidget.cpp" line="65"/> + <location filename="../src/gui/notificationwidget.cpp" line="59"/> <source>Created at %1</source> <translation>%1 を作成しました。</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="78"/> + <location filename="../src/gui/notificationwidget.cpp" line="72"/> <source>Closing in a few seconds...</source> <translation>数秒以内に接続を終了します。</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="125"/> + <location filename="../src/gui/notificationwidget.cpp" line="119"/> <source>%1 request failed at %2</source> <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment> <translation>リクエスト %1 が %2 に失敗 </translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="131"/> + <location filename="../src/gui/notificationwidget.cpp" line="125"/> <source>'%1' selected at %2</source> <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment> <translation>'%1' が %2 に選択されました</translation> @@ -1976,68 +2021,73 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> + <location filename="../src/libsync/creds/oauth.cpp" line="127"/> <source>Error returned from the server: <em>%1</em></source> <translation>サーバからエラーが返されました: <em>%1</em> </translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="130"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="134"/> <source>Empty JSON from OAuth2 redirect</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="139"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="142"/> <source>Unsupported token type: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="151"/> + <location filename="../src/libsync/creds/oauth.cpp" line="144"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="153"/> + <location filename="../src/libsync/creds/oauth.cpp" line="146"/> <source>Unknown Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="291"/> + <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="157"/> + <location filename="../src/libsync/creds/oauth.cpp" line="150"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>ログインエラー</h1><p>%1</p> </translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="202"/> - <location filename="../src/libsync/creds/oauth.cpp" line="205"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="214"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="235"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>ユーザの誤りです</h1><p><em>%1</em>としてログインされましたがｍ、<em>%2</em>でなければいけません。<br>別のタブで %3 からログアウトし、<a href='%4'>ここをクリック</a>して %2 としてログインしてください</p> </translation> </message> @@ -2104,58 +2154,58 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="50"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/> <source>Connect to %1</source> <translation>%1 に接続中</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="52"/> <source>Setup local folder options</source> <translation>ローカルフォルダーのオプションを設定</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="60"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="61"/> <source>Connect...</source> <translation>接続...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="85"/> - <source>Use &virtual files instead of downloading content immediately %1</source> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> + <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="86"/> - <source>(tech preview)</source> - <translation>（技術プレビュー）</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="86"/> - <source>(experimental)</source> - <translation>（実験的）</translation> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> + <source>Use &virtual files instead of downloading content immediately%1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="178"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 フォルダー '%2' はローカルフォルダー '%3' と同期しています</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="181"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <source>Sync the folder '%1'</source> <translation>'%1' フォルダーを同期</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="202"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>警告:</strong> ローカルフォルダーは空ではありません。解決方法を選択してください！</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="283"/> + <source>Virtual files are not available for the selected folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="343"/> <source>Local Sync Folder</source> <translation>ローカル同期フォルダー</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="350"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="377"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="412"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2232,38 +2282,38 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> <source>Connect to %1</source> <translation>%1 に接続中</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> <source>Setup %1 server</source> <translation>%1 サーバーを設定</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="132"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation>このURLは暗号化されていないため安全ではありません。利用はお勧めしません。</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="136"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> <source>This url is secure. You can use it.</source> <translation>このURLは安全です。利用可能です。</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="175"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> <source>&Next ></source> <translation>次(&N) ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> <source>Invalid URL</source> <translation>無効なURL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2271,144 +2321,144 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="251"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="226"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">正常に %1 へ接続されました：%2 バージョン %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>%2 の %1 に接続に失敗:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>%2 の %1 へ接続を試みた際にタイムアウトしました。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="291"/> <source>Trying to connect to %1 at %2...</source> <translation>%2 の %1 へ接続を試みています...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>サーバーへの認証リクエストは '%1' へリダイレクトされました。URLは不正です、サーバーの設定に誤りがあります。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>認証された WebDav リクエストに不正な応答がありました</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>サーバーによってアクセスが拒否されています。適切なアクセス権があるか検証するには、<a href="%1">ここをクリック</a>してブラウザーでサービスにアクセスしてください。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/> <source>Invalid URL</source> <translation>無効なURL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="434"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>ローカルの同期フォルダー %1 はすでに存在するため、同期の設定をしてください。<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>ローカル同期フォルダー %1 を作成中...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>OK</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="443"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>失敗。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>ローカルフォルダー %1 を作成できませんでした</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="471"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>リモートフォルダーが指定されていません！</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="477"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>エラー: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>ownCloud上にフォルダーを作成中: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="506"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>リモートフォルダー %1 は正常に生成されました。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>リモートフォルダー %1 はすでに存在します。同期のために接続しています。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>フォルダーの作成はHTTPのエラーコード %1 で終了しました</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>指定された資格情報が間違っているため、リモートフォルダーの作成に失敗しました！<br/>前に戻って資格情報を確認してください。</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">おそらく資格情報が間違っているため、リモートフォルダーの作成に失敗しました。</font><br/>前に戻り、資格情報をチェックしてください。</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>リモートフォルダー %1 の作成がエラーで失敗しました。<tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>%1 からリモートディレクトリ %2 への同期接続を設定しました。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>%1への接続に成功しました！</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>%1 への接続を確立できませんでした。もう一度確認してください。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="567"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>フォルダー名の変更に失敗しました。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="568"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>フォルダーまたはその中にあるファイルが他のプログラムで開かれているため、フォルダーの削除やバックアップができません。フォルダーまたはファイルを閉じてから再試行するか、セットアップをキャンセルしてください。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>ローカルの同期フォルダー %1 は正常に作成されました！</b></font></translation> </message> @@ -2416,44 +2466,22 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="78"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>%1 接続ウィザード</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="251"/> - <source>Enable technical preview feature?</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/> - <source>When the "virtual files" 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.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="260"/> - <source>Enable virtual files</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/> - <source>Continue to use selective sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="266"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="280"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="271"/> <source>Enable experimental placeholder mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="267"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/> <source>When the "virtual files" mode is enabled no files will be downloaded initially. Instead, a tiny "%1" 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. @@ -2464,7 +2492,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="281"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation type="unfinished"/> </message> @@ -2593,12 +2621,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1246"/> + <location filename="../src/libsync/discovery.cpp" line="1244"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1259"/> + <location filename="../src/libsync/discovery.cpp" line="1257"/> <source>Not allowed to remove, restoring</source> <translation>削除できないので復元しています</translation> </message> @@ -2618,17 +2646,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>そのフォルダーにファイルを追加する権限がありません</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1223"/> + <location filename="../src/libsync/discovery.cpp" line="1222"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1368"/> + <location filename="../src/libsync/discovery.cpp" line="1367"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1428"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation type="unfinished"/> </message> @@ -2636,7 +2664,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1001"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1006"/> <source>Error writing metadata to the database</source> <translation>メタデータのデータベースへの書き込みに失敗</translation> </message> @@ -2706,22 +2734,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="147"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="146"/> <source>could not delete file %1, error: %2</source> <translation>ファイル %1 を削除できません。エラー: %2</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="162"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>注意: %1 で大文字小文字が競合している可能性</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="168"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> <source>could not create folder %1</source> <translation>フォルダー %1 を作成できません</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="179"/> <source>Error writing metadata to the database</source> <translation>メタデータのデータベースへの書き込みに失敗</translation> </message> @@ -2729,7 +2757,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="100"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> <source>Could not remove %1 because of a local file name clash</source> <translation>%1 はローカルファイル名が衝突しているため削除できませんでした</translation> </message> @@ -2737,18 +2765,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="218"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>ファイル %1 はローカルファイル名が衝突しているため %2 に名前を変更できません</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="249"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="255"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="248"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="254"/> <source>Error writing metadata to the database</source> <translation>メタデータのデータベースへの書き込みに失敗</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="261"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> <source>Error setting pin state</source> <translation type="unfinished"/> </message> @@ -2827,7 +2855,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/libsync/propagateupload.cpp" line="663"/> + <location filename="../src/libsync/propagateupload.cpp" line="677"/> <source>Error writing metadata to the database</source> <translation>メタデータのデータベースへの書き込みに失敗</translation> </message> @@ -2868,12 +2896,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileTUS</name> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="203"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>ローカルファイルを同期中に削除します。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>ローカルのファイルが同期中に変更されました。</translation> </message> @@ -3045,28 +3073,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SettingsDialog</name> <message> - <location filename="../src/gui/settingsdialog.cpp" line="117"/> + <location filename="../src/gui/settingsdialog.cpp" line="196"/> <source>Settings</source> <translation>設定</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="108"/> + <location filename="../src/gui/settingsdialog.cpp" line="187"/> <source>Activity</source> <translation>アクティビティ</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="128"/> - <location filename="../src/gui/settingsdialog.cpp" line="131"/> + <location filename="../src/gui/settingsdialog.cpp" line="176"/> + <source>Add account</source> + <translation>アカウントを追加</translation> + </message> + <message> + <location filename="../src/gui/settingsdialog.cpp" line="207"/> + <location filename="../src/gui/settingsdialog.cpp" line="210"/> <source>Quit %1</source> <translation>%1 を終了</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="132"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="254"/> + <location filename="../src/gui/settingsdialog.cpp" line="342"/> <source>Account</source> <translation>アカウント</translation> </message> @@ -3104,42 +3137,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>OwnCloudのパス:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="108"/> + <location filename="../src/gui/sharedialog.cpp" line="110"/> <source>%1 Sharing</source> <translation>%1 を共有中</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="86"/> + <location filename="../src/gui/sharedialog.cpp" line="88"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="105"/> + <location filename="../src/gui/sharedialog.cpp" line="107"/> <source>Folder: %2</source> <translation>フォルダー: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="111"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>The server does not allow sharing</source> <translation>サーバーで共有を許可していません</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="127"/> + <location filename="../src/gui/sharedialog.cpp" line="129"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>サーバーから共有権限を取得できる最大数で取得しています</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="197"/> + <location filename="../src/gui/sharedialog.cpp" line="202"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>再共有権限がない共有ため、このファイルは共有できません。</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="211"/> + <location filename="../src/gui/sharedialog.cpp" line="216"/> <source>Users and Groups</source> <translation>ユーザーとグループ</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="218"/> + <location filename="../src/gui/sharedialog.cpp" line="223"/> <source>Public Links</source> <translation>公開リンク</translation> </message> @@ -3334,32 +3367,32 @@ 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/shareusergroupwidget.cpp" line="210"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> <source>The item is not shared with any users or groups</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="241"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> <source>Open link in browser</source> <translation>ブラウザでリンクを開く</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> <source>Copy link to clipboard</source> <translation>クリップボードにリンクをコピー</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> <source>Send link by email</source> <translation>メールでリンクを送信</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="255"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> <source>No results for '%1'</source> <translation>'%1' は見つかりませんでした</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> <source>I shared something with you</source> <translation type="unfinished"/> </message> @@ -3393,17 +3426,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>…</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> <source>create</source> <translation>作成</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> <source>change</source> <translation>更新</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> <source>delete</source> <translation>削除</translation> </message> @@ -3770,17 +3803,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>%1 しか空き容量がありません、開始するためには少なくとも %2 は必要です。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="482"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1035"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1042"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> @@ -3795,27 +3828,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="498"/> <source>Using virtual files with suffix, but suffix is not set</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="515"/> + <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>Unable to read the blacklist from the local database</source> <translation>ローカルデータベースからブラックリストを読み込みできません</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="546"/> + <location filename="../src/libsync/syncengine.cpp" line="541"/> <source>Unable to read from the sync journal.</source> <translation>同期ジャーナルから読み込みできません</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="630"/> + <location filename="../src/libsync/syncengine.cpp" line="625"/> <source>Cannot open the sync journal</source> <translation>同期ジャーナルを開くことができません</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1018"/> <source>Aborted</source> <translation>中止しました</translation> </message> @@ -3831,20 +3864,10 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="341"/> - <source><p>Version %2. For more information visit <a href="%3">https://%4</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Hannah von Reth, and others.</small></p></source> + <location filename="../src/libsync/theme.cpp" line="382"/> + <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/libsync/theme.cpp" line="348"/> - <source><p>Copyright ownCloud GmbH</p></source> - <translation><p>Copyright ownCloud GmbH</p></translation> - </message> - <message> - <location filename="../src/libsync/theme.cpp" line="349"/> - <source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source> - <translation><p>%1 が配布し、 GNU General Public License (GPL) バージョン2.0 の下でライセンスされています。<br/>%2 及び %2 のロゴはアメリカ合衆国またはその他の国、あるいはその両方における %1 の登録商標です。</p></translation> - </message> </context> <context> <name>OCC::ValidateChecksumHeader</name> @@ -3865,245 +3888,252 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::Vfs</name> + <message> + <location filename="../src/common/vfs.cpp" line="72"/> + <source>The Virtual filesystem feature requires a NTFS file system, %1 is using %2</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="267"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Please sign in</source> <translation>サインインしてください</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="313"/> + <location filename="../src/gui/owncloudgui.cpp" line="304"/> <source>Folder %1: %2</source> <translation>フォルダー %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>同期するフォルダーがありません。</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="340"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>ブラウザーで開く</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="389"/> - <location filename="../src/gui/owncloudgui.cpp" line="712"/> - <location filename="../src/gui/owncloudgui.cpp" line="806"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Log in...</source> <translation>ログイン...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="393"/> - <location filename="../src/gui/owncloudgui.cpp" line="704"/> - <location filename="../src/gui/owncloudgui.cpp" line="808"/> + <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Log out</source> <translation>ログアウト</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="499"/> + <location filename="../src/gui/owncloudgui.cpp" line="490"/> <source>Recent Changes</source> <translation>最近変更されたファイル</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="358"/> <source>Managed Folders:</source> <translation>管理フォルダー:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="361"/> <source>Open folder '%1'</source> <translation>フォルダー ’%1’ を開く</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="342"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>%1をブラウザーで開く</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="190"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="789"/> + <location filename="../src/gui/owncloudgui.cpp" line="780"/> <source>Unknown status</source> <translation>不明な状態</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Settings...</source> <translation>設定...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>Details...</source> <translation>詳細...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="799"/> + <location filename="../src/gui/owncloudgui.cpp" line="790"/> <source>Help</source> <translation>ヘルプ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="803"/> + <location filename="../src/gui/owncloudgui.cpp" line="794"/> <source>Quit %1</source> <translation>%1 を終了</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="248"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Disconnected from %1</source> <translation>%1 から切断されました</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="198"/> + <location filename="../src/gui/owncloudgui.cpp" line="189"/> <source>Unsupported Server Version</source> <translation>サポートされていないサーバーバージョン</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="238"/> + <location filename="../src/gui/owncloudgui.cpp" line="229"/> <source>Disconnected</source> <translation>切断しました</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="240"/> + <location filename="../src/gui/owncloudgui.cpp" line="231"/> <source>Disconnected from some accounts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from accounts:</source> <translation>アカウントから切断:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="253"/> + <location filename="../src/gui/owncloudgui.cpp" line="244"/> <source>Account %1: %2</source> <translation>アカウント %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> <source>Signed out</source> <translation>サインアウト</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="272"/> + <location filename="../src/gui/owncloudgui.cpp" line="263"/> <source>Account synchronization is disabled</source> <translation>アカウントの同期は無効になっています</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="264"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="321"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>Unresolved conflicts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="328"/> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="378"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Unpause all folders</source> <translation>すべてのフォルダーの同期を再開</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="383"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> <source>Pause all folders</source> <translation>すべてのフォルダーの同期を一時停止</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="683"/> + <location filename="../src/gui/owncloudgui.cpp" line="674"/> <source>Unpause all synchronization</source> <translation>すべての同期を再開</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="685"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause synchronization</source> <translation>同期を再開</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="693"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Pause all synchronization</source> <translation>すべての同期を一時停止</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause synchronization</source> <translation>同期を一時停止</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="702"/> + <location filename="../src/gui/owncloudgui.cpp" line="693"/> <source>Log out of all accounts</source> <translation>全てのアカウントからログアウト</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="710"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> <source>Log in to all accounts...</source> <translation>全てのアカウントにログイン</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>New account...</source> <translation>新規アカウント...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="801"/> - <location filename="../src/gui/owncloudgui.cpp" line="1151"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>About %1</source> <translation>%1 について</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="834"/> + <location filename="../src/gui/owncloudgui.cpp" line="825"/> <source>No items synced recently</source> <translation>最近同期されたアイテムはありません。</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="856"/> + <location filename="../src/gui/owncloudgui.cpp" line="847"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="874"/> + <location filename="../src/gui/owncloudgui.cpp" line="865"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>同期中 %2 中 %1 (残り %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="879"/> + <location filename="../src/gui/owncloudgui.cpp" line="870"/> <source>Syncing %1 of %2</source> <translation>%2 の %1 を同期しています</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="888"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 (%2 left)</source> <translation>同期中 %1 (残り %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="891"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1</source> <translation>同期中 %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="909"/> + <location filename="../src/gui/owncloudgui.cpp" line="899"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> <source>Up to date</source> <translation>最新です</translation> </message> @@ -4117,84 +4147,82 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="52"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="108"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="207"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="316"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="490"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="501"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="135"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="234"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="553"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="564"/> <source>TextLabel</source> <translation>テキストラベル</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="62"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="86"/> <source>Server</source> <translation>サーバー</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="414"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="477"/> <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source> <translation><html><head/><body><p>チェックした場合、ローカルフォルダー内に存在するコンテンツはサーバーからクリーンな同期を開始するために削除されます。</p><p>もしローカルのコンテンツをサーバーのフォルダーにアップロードするなら、チェックしないでください。</p></body></html></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="417"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="480"/> <source>Start a &clean sync (Erases the local folder!)</source> <translation>クリーン同期を開始(ローカルフォルダーは削除されます！)(&C)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="165"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="192"/> <source>Ask for confirmation before synchroni&zing folders larger than</source> <translation>指定された容量以上のフォルダーは同期前に確認する</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="182"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="209"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="191"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="218"/> <source>Ask for confirmation before synchronizing e&xternal storages</source> <translation>外部ストレージと同期する前に確認する(&X)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="227"/> <source>Choose what to sync</source> <translation>同期フォルダーを選択</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="245"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="248"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="272"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="275"/> <source><html><head/><body><p>When this option is selected, the wizard will close without synchronizing anything. You can use the &quot;Add Folder Sync Connection&quot; button from the account settings to choose which pair of local and remote folder you wish to synchronize</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="251"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/> <source>Manually create folder sync connections </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="332"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> <source>&Local Folder</source> <translation>ローカルフォルダー(&L)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="373"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="436"/> <source>pbSelectLocalFolder</source> <translation>pbSelectLocalFolder</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="404"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="467"/> <source>&Keep local data</source> <translation>ローカルデータを保持(&K)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="125"/> <source>S&ynchronize everything from server (recommended)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="435"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="498"/> <source>Status message</source> <translation>状態メッセージ</translation> </message> @@ -4249,7 +4277,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="196"/> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> <source>TextLabel</source> <translation>テキストラベル</translation> </message> @@ -4264,7 +4292,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="160"/> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> <source>Error Label</source> <translation>エラーラベル</translation> </message> @@ -4296,37 +4324,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>今後</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>%n日前</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>%n 時間前</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>今</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>1分以内</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform> %n 分前</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>数分前</translation> </message> @@ -4409,11 +4437,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>ownCloudTheme::about()</name> + <name>ownCloudTheme::aboutVersions()</name> + <message> + <location filename="../src/libsync/theme.cpp" line="360"/> + <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="320"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> - <translation><p><small><a href="%1">%2</a> %3, %4 のGitリビジョンからのビルド Qt %5, %6 を利用</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="350"/> + <source>%1 (Built against Qt %1)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ownCloudTheme::versionWithSha</name> + <message> + <location filename="../src/libsync/theme.cpp" line="355"/> + <source>%1 %2</source> + <translation>%1 %2</translation> </message> </context> <context> @@ -4519,52 +4563,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>未定義の状態</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>同期開始を待っています</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>同期を実行中</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>同期成功</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>同期が完了しました。一部のファイルが除外されました。</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>同期エラー</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>設定エラー</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>同期の準備中</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>中止しています...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>同期を一時停止</translation> </message> @@ -4572,53 +4616,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>utility</name> <message> - <location filename="../src/gui/guiutility.cpp" line="38"/> + <location filename="../src/gui/guiutility.cpp" line="39"/> <source>Could not open browser</source> <translation>ブラウザを開くことができませんでした。</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="39"/> + <location filename="../src/gui/guiutility.cpp" line="40"/> <source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source> <translation>URL %1 をブラウザで開く際にエラーが発生しました。おそらくデフォルトのブラウザが設定されていないのでは？</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="62"/> + <location filename="../src/gui/guiutility.cpp" line="63"/> <source>Could not open email client</source> <translation>電子メールクライアントを開くことができませんでした</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="63"/> + <location filename="../src/gui/guiutility.cpp" line="64"/> <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source> <translation>メールクライアントを起動して新しいメッセージを作成するときにエラーが発生しました。デフォルトのメールクライアントが設定されていませんか？</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="78"/> + <location filename="../src/gui/guiutility.cpp" line="79"/> <source>Always available locally</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="82"/> + <location filename="../src/gui/guiutility.cpp" line="83"/> <source>Some available online only</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="84"/> - <location filename="../src/gui/guiutility.cpp" line="86"/> + <location filename="../src/gui/guiutility.cpp" line="85"/> + <location filename="../src/gui/guiutility.cpp" line="87"/> <source>Available online only</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="80"/> + <location filename="../src/gui/guiutility.cpp" line="81"/> <source>Currently available locally</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="93"/> + <location filename="../src/gui/guiutility.cpp" line="94"/> <source>Make always available locally</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="98"/> + <location filename="../src/gui/guiutility.cpp" line="99"/> <source>Free up local space</source> <translation type="unfinished"/> </message> diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index d885e3ce5..16c59dab8 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -13,7 +13,7 @@ <translation>Kunne ikke flytte '%1' til '%2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="445"/> + <location filename="../src/common/filesystembase.cpp" line="442"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Flytting til søppelbøtten er ikke støttet på denne plattformen</translation> </message> @@ -87,22 +87,45 @@ <translation>Skjema</translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="58"/> + <location filename="../src/gui/notificationwidget.ui" line="73"/> <source>Lorem ipsum dolor sit amet</source> <translation>Lorem ipsum dolor sit amet</translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="71"/> + <location filename="../src/gui/notificationwidget.ui" line="86"/> <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source> <translation>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="91"/> + <location filename="../src/gui/notificationwidget.ui" line="106"/> <source>TextLabel</source> <translation>Tekst-etikett</translation> </message> </context> <context> + <name>OCC::AboutDialog</name> + <message> + <location filename="../src/gui/aboutdialog.ui" line="24"/> + <source>About</source> + <translation>Om</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.ui" line="88"/> + <source>TextLabel</source> + <translation>Tekst-etikett</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.ui" line="96"/> + <source>Versions</source> + <translation>Versjoner</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.cpp" line="28"/> + <source>About %1</source> + <translation>Om %1</translation> + </message> +</context> +<context> <name>OCC::AbstractNetworkJob</name> <message> <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> @@ -121,6 +144,14 @@ </message> </context> <context> + <name>OCC::Account</name> + <message> + <location filename="../src/libsync/account.cpp" line="121"/> + <source>%1@%2</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::AccountSettings</name> <message> <location filename="../src/gui/accountsettings.ui" line="14"/> @@ -163,15 +194,15 @@ <translation>Bruk manuelle endringer</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="267"/> + <location filename="../src/gui/accountsettings.ui" line="282"/> <source>Apply</source> <translation>Bruk</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="254"/> - <location filename="../src/gui/accountsettings.cpp" line="512"/> - <location filename="../src/gui/accountsettings.cpp" line="624"/> - <location filename="../src/gui/accountsettings.cpp" line="1083"/> + <location filename="../src/gui/accountsettings.ui" line="269"/> + <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="611"/> + <location filename="../src/gui/accountsettings.cpp" line="1048"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -181,87 +212,67 @@ <translation>Tilkoblet <server> som <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="180"/> <source>No account configured.</source> <translation>Ingen konto konfigurert.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="200"/> - <source>Add new</source> - <translation>Legg til ny</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="209"/> + <location filename="../src/gui/accountsettings.cpp" line="203"/> <source>Remove</source> <translation>Fjern</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="213"/> + <location filename="../src/gui/accountsettings.cpp" line="207"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="297"/> <source>Choose what to sync</source> <translation>Velg hva som synkroniseres</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Force sync now</source> <translation>Tving synkronisering nå</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="305"/> <source>Restart sync</source> <translation>Prøv synkronisering igjen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="327"/> + <location filename="../src/gui/accountsettings.cpp" line="314"/> <source>Remove folder sync connection</source> <translation>Fjern tilkobling for mappe-synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>Enable virtual file support %1...</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>(tech preview)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>(experimental)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="445"/> + <location filename="../src/gui/accountsettings.cpp" line="433"/> <source>Folder creation failed</source> <translation>Oppretting av mappe feilet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="434"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Klarte ikke å opprette lokal mappe <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="504"/> + <location filename="../src/gui/accountsettings.cpp" line="491"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Bekreft fjerning av tilkobling for mappe-synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="511"/> + <location filename="../src/gui/accountsettings.cpp" line="499"/> <source>Remove Folder Sync Connection</source> <translation>Fjern tilkobling for mappe-synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="615"/> + <location filename="../src/gui/accountsettings.cpp" line="602"/> <source>Disable virtual file support?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="616"/> + <location filename="../src/gui/accountsettings.cpp" line="603"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -270,173 +281,183 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="623"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Disable support</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="733"/> + <location filename="../src/gui/accountsettings.cpp" line="712"/> <source>Sync Running</source> <translation>Synkroniserer...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="734"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Synkronisering kjører.<br/>Vil du avbryte den?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="829"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>%1 in use</source> <translation>%1 i bruk</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="856"/> + <location filename="../src/gui/accountsettings.cpp" line="836"/> <source>%1 as <i>%2</i></source> <translation>%1 som <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="845"/> <source>Connected to %1.</source> <translation>Tilkoblet %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="870"/> + <location filename="../src/gui/accountsettings.cpp" line="850"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 er midlertidig utilgjengelig.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Server %1 er for øyeblikket i vedlikeholdsmodus.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="876"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Signed out from %1.</source> <translation>Logget ut fra %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="886"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Connecting to %1...</source> <translation>Kobler til %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="871"/> <source>No connection to %1 at %2.</source> <translation>Ingen tilkobling til %1 på %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="930"/> + <location filename="../src/gui/accountsettings.cpp" line="910"/> <source>Log in</source> <translation>Logg inn</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1026"/> + <location filename="../src/gui/accountsettings.cpp" line="1005"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Noen mapper ble ikke synkronisert fordi de er for store</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1028"/> + <location filename="../src/gui/accountsettings.cpp" line="1007"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Noen mapper ble ikke synkronisert fordi de er eksterne lagringsplasser:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1029"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Noen mapper ble ikke synkronisert fordi de er for store eller de er eksterne lagringsplasser:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1075"/> + <location filename="../src/gui/accountsettings.cpp" line="1041"/> <source>Confirm Account Removal</source> <translation>Bekreft fjerning av konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1076"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Vil du virkelig fjerne tilkoblingen til kontoen <i>%1</i>?</p><p><b>Merk:</b> Dette vil <b>ikke</b> slette noen filer.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1082"/> + <location filename="../src/gui/accountsettings.cpp" line="1047"/> <source>Remove connection</source> <translation>Fjern tilkobling</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="306"/> + <location filename="../src/gui/accountsettings.cpp" line="293"/> <source>Open folder</source> <translation>Åpne mappe</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="205"/> - <location filename="../src/gui/accountsettings.cpp" line="932"/> + <location filename="../src/gui/accountsettings.cpp" line="199"/> + <location filename="../src/gui/accountsettings.cpp" line="912"/> <source>Log out</source> <translation>Logg ut</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="265"/> + <location filename="../src/gui/accountsettings.cpp" line="252"/> <source>Open local folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="273"/> + <location filename="../src/gui/accountsettings.cpp" line="260"/> <source>Open folder in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="324"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Resume sync</source> <translation>Fortsett synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="324"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Pause sync</source> <translation>Sett synkronisering på pause</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="331"/> + <location filename="../src/gui/accountsettings.cpp" line="318"/> <source>Availability</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="348"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source>Disable virtual file support...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="505"/> + <location filename="../src/gui/accountsettings.cpp" line="343"/> + <source>Enable virtual file support%1...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="343"/> + <source> (experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="492"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Vil du virkelig stoppe synkronisering av mappen <i>%1</i>?</p><p><b>Merk:</b> Dette vil <b>ikke</b> slette noen filer.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="816"/> + <location filename="../src/gui/accountsettings.cpp" line="796"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) av %2 i bruk. Noen mapper, inkludert nettverkstilkoblede eller delte mapper, kan ha andre begrensninger.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="817"/> + <location filename="../src/gui/accountsettings.cpp" line="797"/> <source>%1 of %2 in use</source> <translation>%1 av %2 i bruk</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="826"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Currently there is no storage usage information available.</source> <translation>Ingen informasjon om bruk av lagringsplass tilgjengelig for øyeblikket.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="863"/> + <location filename="../src/gui/accountsettings.cpp" line="843"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="883"/> + <location filename="../src/gui/accountsettings.cpp" line="863"/> <source>Obtaining authorization from the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="896"/> + <location filename="../src/gui/accountsettings.cpp" line="876"/> <source>Server configuration error: %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="907"/> + <location filename="../src/gui/accountsettings.cpp" line="887"/> <source>No %1 connection configured.</source> <translation>Ingen %1-forbindelse konfigurert.</translation> </message> @@ -492,12 +513,12 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 på %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 på %2 (frakoblet)</translation> </message> @@ -513,44 +534,44 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="515"/> - <location filename="../src/gui/activitywidget.cpp" line="563"/> + <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="570"/> <source>Server Activity</source> <translation>Server-aktivitet</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Synkroniseringsprotokoll</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>Ikke synkronisert</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="574"/> + <location filename="../src/gui/activitywidget.cpp" line="581"/> <source>Not Synced (%1)</source> <extracomment>%1 is the number of not synced files.</extracomment> <translation>Ikke synkronisert (%1)</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="606"/> + <location filename="../src/gui/activitywidget.cpp" line="613"/> <source>The server activity list has been copied to the clipboard.</source> <translation>Server-aktivitetslisten er kopiert til utklippstavlen.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="610"/> + <location filename="../src/gui/activitywidget.cpp" line="617"/> <source>The sync activity list has been copied to the clipboard.</source> <translation>Synkroniserings-aktivitetslisten er kopiert til utklippstavlen.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="613"/> + <location filename="../src/gui/activitywidget.cpp" line="620"/> <source>The list of unsynced items has been copied to the clipboard.</source> <translation>Listen med usynkroniserte elementer ble kopiert til utklippstavlen.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="618"/> + <location filename="../src/gui/activitywidget.cpp" line="625"/> <source>Copied to clipboard</source> <translation>Kopiert til utklippstavlen</translation> </message> @@ -570,47 +591,47 @@ This action will abort any currently running synchronization.</source> <translation>Tekst-etikett</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Server-aktiviteter</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Kopier</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="93"/> + <location filename="../src/gui/activitywidget.cpp" line="100"/> <source>Copy the activity list to the clipboard.</source> <translation>Kopier aktivitetslisten til utklippstavlen.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Varsler</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="351"/> + <location filename="../src/gui/activitywidget.cpp" line="358"/> <source>%n notifications(s) for %1.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="357"/> + <location filename="../src/gui/activitywidget.cpp" line="364"/> <source>%n notifications(s) for %1 and %2.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="359"/> + <location filename="../src/gui/activitywidget.cpp" line="366"/> <source>New notifications for %1, %2 and other accounts.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="362"/> + <location filename="../src/gui/activitywidget.cpp" line="369"/> <source>Open the activity view for details.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="145"/> + <location filename="../src/gui/activitywidget.cpp" line="152"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Konto %1 har ikke aktiviteter aktivert.</translation> </message> @@ -661,42 +682,42 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="134"/> + <location filename="../src/gui/application.cpp" line="136"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Å fortsette vil<b> slette disse innstillingene </b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="138"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Å fortsette vil <b> ignorere disse innstillingene </b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="142"/> + <location filename="../src/gui/application.cpp" line="144"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="149"/> + <location filename="../src/gui/application.cpp" line="151"/> <source>Quit</source> <translation>Avslutt</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="150"/> + <location filename="../src/gui/application.cpp" line="152"/> <source>Continue</source> <translation>Fortsett</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="299"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Error accessing the configuration file</source> <translation>Feil ved lesing av konfigurasjonsfil</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="300"/> + <location filename="../src/gui/application.cpp" line="310"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>En feil oppstod ved aksessering av konfigurasjonsfilen på %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="303"/> + <location filename="../src/gui/application.cpp" line="313"/> <source>Quit ownCloud</source> <translation>Avslutt ownCloud</translation> </message> @@ -727,7 +748,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1135"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1140"/> <source>Error writing metadata to the database</source> <translation>Feil ved skriving av metadata til databasen</translation> </message> @@ -769,7 +790,7 @@ This action will abort any currently running synchronization.</source> <name>OCC::DiscoverySingleDirectoryJob</name> <message> <location filename="../src/libsync/discoveryphase.cpp" line="480"/> - <location filename="../src/libsync/discoveryphase.cpp" line="502"/> + <location filename="../src/libsync/discoveryphase.cpp" line="501"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation type="unfinished"/> </message> @@ -805,134 +826,134 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="172"/> + <location filename="../src/gui/folder.cpp" line="173"/> <source>Local folder %1 does not exist.</source> <translation>Lokal mappe %1 eksisterer ikke.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="175"/> + <location filename="../src/gui/folder.cpp" line="176"/> <source>%1 should be a folder but is not.</source> <translation>%1 skal være en mappe men er ikke det.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="178"/> + <location filename="../src/gui/folder.cpp" line="179"/> <source>%1 is not readable.</source> <translation>%1 kan ikke leses.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 har blitt fjernet.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 har blitt oppdatert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 har blitt omdøpt til %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2.</source> <translation>%1 har blitt flyttet til %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="414"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 og %n annen fil har blitt fjernet.</numerusform><numerusform>%1 og %n andre filer har blitt fjernet.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="420"/> + <location filename="../src/gui/folder.cpp" line="421"/> <source>%1 and %n other file(s) have been added.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="427"/> + <location filename="../src/gui/folder.cpp" line="428"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 og %n annen fil har blitt oppdatert.</numerusform><numerusform>%1 og %n andre filer har blitt oppdatert.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="434"/> + <location filename="../src/gui/folder.cpp" line="435"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 er blitt omdøpt til %2 og %n annen fil har blitt omdøpt.</numerusform><numerusform>%1 er blitt omdøpt til %2 og %n andre filer har blitt omdøpt.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="441"/> + <location filename="../src/gui/folder.cpp" line="442"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 er blitt flyttet til %2 og %n annen fil har blitt flyttet.</numerusform><numerusform>%1 er blitt flyttet til %2 og %n andre filer har blitt flyttet.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="448"/> + <location filename="../src/gui/folder.cpp" line="449"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 og %n andre filer har synkroniseringskonflikter.</numerusform><numerusform>%1 og %n andre filer har synkroniseringskonflikter.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 har en synkroniseringskonflikt. Sjekk konflikt-filen.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="455"/> + <location filename="../src/gui/folder.cpp" line="456"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 og %n andre filer kunne ikke synkroniseres pga. feil. Se loggen for detaljer.</numerusform><numerusform>%1 og %n andre filer kunne ikke synkroniseres pga. feil. Se loggen for detaljer.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 kunne ikke synkroniseres pga. en feil. Se loggen for detaljer.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="463"/> + <location filename="../src/gui/folder.cpp" line="464"/> <source>Sync Activity</source> <translation>Synkroniseringsaktivitet</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="800"/> <source>Could not read system exclude file</source> <translation>Klarte ikke å lese systemets ekskluderingsfil</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1045"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>En ny mappe større enn %1 MB er blitt lagt til: %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>A folder from an external storage has been added. </source> <translation>En mappe fra et eksternt lager er blitt lagt til. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1049"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Gå til Innstillinger og velg den hvis du ønsker å laste den ned.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1109"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Mappen %1 var laget, men har tidligere blitt ekskludert fra synkronisering. Data i mappen vil derfor ikke bli synkronisert. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1112"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Filen %1 ble opprettet men har tidligere blitt ekskludert fra synkronisering. Den vil ikke bli synkronisert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <source>Changes in synchronized folders could not be tracked reliably. This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default). @@ -941,7 +962,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1208"/> + <location filename="../src/gui/folder.cpp" line="1197"/> <source>All files in the sync folder '%1' folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to keep the files, they will be re-synced with the server if you have rights to do so. @@ -952,7 +973,7 @@ Hvis du velger å beholde filene, vil de bli synkronisert tilbake til serveren h Hvis du velger å slette filene, blir de utilgjengelige for deg hvis du ikke er eieren av filen.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1202"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -961,17 +982,17 @@ Er du sikker på at du ønsker å synkronisere denne handlingen med serveren? Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert tilbake fra serveren.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1217"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>Fjerne alle filer?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Fjern alle filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Behold filer</translation> </message> @@ -979,107 +1000,107 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="357"/> <source>Could not reset folder state</source> <translation>Klarte ikke å tilbakestille mappetilstand</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="356"/> + <location filename="../src/gui/folderman.cpp" line="358"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>En gammel synkroniseringsjournal '%1' ble funnet men kunne ikke fjernes. Pass på at ingen applikasjoner bruker den.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation> (sikkerhetskopi)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation> (sikkerhetskopi %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Undefined State.</source> <translation>Udefinert tilstand.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1332"/> <source>Waiting to start syncing.</source> <translation>Venter på å starte synkronisering.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>Preparing for sync.</source> <translation>Forbereder synkronisering.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1336"/> + <location filename="../src/gui/folderman.cpp" line="1338"/> <source>Sync is running.</source> <translation>Synkronisering kjører.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synkronisering var vellykket, uløste konflikter.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1343"/> + <location filename="../src/gui/folderman.cpp" line="1345"/> <source>Last Sync was successful.</source> <translation>Siste synkronisering var vellykket.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>Feil med oppsett.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>Brukeravbrudd.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>Sync is paused.</source> <translation>Synkronisering er satt på pause.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1361"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synkronisering er satt på pause)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1369"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <source>No valid folder selected!</source> <translation>Ingen gyldig mappe valgt!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path does not exist!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1382"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>The selected path is not a folder!</source> <translation>Den valgte stien er ikke en mappe!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1391"/> <source>You have no permission to write to the selected folder!</source> <translation>Du har ikke skrivetilgang til den valgte mappen!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1456"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Det er allerede en synkronisering fra serveren til denne lokale mappen. Velg en annen mappe!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1436"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>Den lokale mappen %1 inneholder allerede en mappe brukt i en mappe-synkronisering. Velg en annen!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1442"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>Den lokale mappen %1 er allerede en undermappe av en mappe brukt i en mappe-synkronisering. Velg en annen!</translation> </message> @@ -1087,16 +1108,11 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <context> <name>OCC::FolderStatusDelegate</name> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="47"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="46"/> <source>Add Folder Sync Connection</source> <translation>Legg til mappe-synkronisering</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="248"/> - <source>Synchronizing with local folder</source> - <translation>Synkroniserer med lokal mappe</translation> - </message> - <message> <location filename="../src/gui/folderstatusdelegate.cpp" line="299"/> <source>File</source> <translation>Fil</translation> @@ -1147,107 +1163,117 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <translation>Det er uløste konflikter. Klikk for detaljer.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <source>Synchronizing VirtualFiles with local folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <source>Synchronizing with local folder</source> + <translation>Synkroniserer med lokal mappe</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in remote '%1'</source> <translation>Sjekker for endringer i ekstern '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> <source>Checking for changes in local '%1'</source> <translation>Sjekker for endringer i lokal '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> <source>Reconciling changes</source> <translation>Sammenslår endringer</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synkroniserer %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>nedlasting %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>opplasting %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 av %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 igjen, %1 av %2, fil %3 of %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 av %2, fil %3 av %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> <source>file %1 of %2</source> <translation>fil %1 av %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> <source>Waiting...</source> <translation>Venter..</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Venter på %n annen mappe...</numerusform><numerusform>Venter på %n andre mappe(r)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> <source>Preparing to sync...</source> <translation>Forbereder synkronisering...</translation> </message> @@ -1271,12 +1297,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="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Folder Sync Connection</source> <translation>Legg til mappe-synkronisering</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="576"/> + <location filename="../src/gui/folderwizard.cpp" line="578"/> <source>Add Sync Connection</source> <translation>Legg til tilkobling for synkronisering</translation> </message> @@ -1284,17 +1310,17 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="68"/> + <location filename="../src/gui/folderwizard.cpp" line="69"/> <source>Click to select a local folder to sync.</source> <translation>Klikk for å velge en lokal mappe å synkronisere.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="75"/> + <location filename="../src/gui/folderwizard.cpp" line="76"/> <source>Enter the path to the local folder.</source> <translation>Legg inn stien til den lokale mappen.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="136"/> + <location filename="../src/gui/folderwizard.cpp" line="137"/> <source>Select the source folder</source> <translation>Velg kildemappe</translation> </message> @@ -1302,52 +1328,52 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="184"/> + <location filename="../src/gui/folderwizard.cpp" line="185"/> <source>Create Remote Folder</source> <translation>Opprett ekstern mappe</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="185"/> + <location filename="../src/gui/folderwizard.cpp" line="186"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Oppgi navnet på den nye mappen som skal opprettes under '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="215"/> + <location filename="../src/gui/folderwizard.cpp" line="216"/> <source>Folder was successfully created on %1.</source> <translation>Mappen ble opprettet på %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="226"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Authentication failed accessing %1</source> <translation>Autentisering feilet ved tilgang til %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="228"/> + <location filename="../src/gui/folderwizard.cpp" line="229"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Klarte ikke å opprette mappen på %1. Sjekk manuelt.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="247"/> <source>Failed to list a folder. Error: %1</source> <translation>Klarte ikke å liste en mappe. Feil: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="328"/> <source>Choose this to sync the entire account</source> <translation>Velg dette for å synkronisere en hel konto</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="440"/> <source>This folder is already being synced.</source> <translation>Denne mappen synkroniseres allerede.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="442"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Du synkroniserer allerede <i>%1</i>, som er foreldremappe for <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="444"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1355,30 +1381,30 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> - <source>Use virtual files instead of downloading content immediately %1</source> + <location filename="../src/gui/folderwizard.cpp" line="485"/> + <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="489"/> - <source>(tech preview)</source> + <location filename="../src/gui/folderwizard.cpp" line="485"/> + <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="489"/> - <source>(experimental)</source> + <location filename="../src/gui/folderwizard.cpp" line="519"/> + <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="49"/> + <location filename="../src/gui/folderwizard.cpp" line="50"/> <source><b>Warning:</b> %1</source> <translation><b>Advarsel:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="51"/> + <location filename="../src/gui/folderwizard.cpp" line="52"/> <source><b>Warning:</b></source> <translation><b>Advarsel:</b></translation> </message> @@ -1388,12 +1414,12 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <message> <location filename="../src/libsync/propagatedownload.cpp" line="180"/> <source>No E-Tag received from server, check Proxy/Gateway</source> - <translation type="unfinished"/> + <translation>Ingen E-Tag mottatt fra server. Sjekk proxy/gateway.</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="187"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> - <translation type="unfinished"/> + <translation>Vi mottok en forskjellig E-Tag for å fortsette. Prøver igjen neste gang.</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="197"/> @@ -1403,7 +1429,7 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <message> <location filename="../src/libsync/propagatedownload.cpp" line="224"/> <source>Server returned wrong content-range</source> - <translation type="unfinished"/> + <translation>Serveren returnerte feil content-range</translation> </message> </context> <context> @@ -1427,48 +1453,73 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <translation>Vanlige innstillinger</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="55"/> - <source>For System Tray</source> - <translation>For systemkurven</translation> + <location filename="../src/gui/generalsettings.ui" line="80"/> + <source>Sync hidden files</source> + <translation>Synkroniser skjulte filer</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="184"/> - <source>Network</source> + <location filename="../src/gui/generalsettings.ui" line="109"/> + <source>Log Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="257"/> + <location filename="../src/gui/generalsettings.ui" line="136"/> + <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="196"/> + <source>Network</source> + <translation>Nettverk</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="208"/> + <source>Updates</source> + <translation>Oppdateringer</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="237"/> <source>stable</source> <translation>Stabil</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="262"/> + <location filename="../src/gui/generalsettings.ui" line="242"/> <source>beta</source> <translation>beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="68"/> + <location filename="../src/gui/generalsettings.ui" line="337"/> + <source>About</source> + <translation>Om</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="65"/> <source>Advanced</source> <translation>Avansert</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="100"/> + <location filename="../src/gui/generalsettings.ui" line="41"/> + <source>Use &Monochrome Icons in the system tray</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="144"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Be om bekreftelse før synkronisering av mapper større enn</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="120"/> + <location filename="../src/gui/generalsettings.ui" line="164"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="186"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Be om bekreftelse før synkronisering av eksterne lagre</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="41"/> + <location filename="../src/gui/generalsettings.ui" line="55"/> <source>&Launch on System Startup</source> <translation>&Start når maskinen starter</translation> </message> @@ -1478,57 +1529,42 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <translation>Vis &påminnelser på skrivebordet</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="58"/> - <source>Use &Monochrome Icons</source> - <translation>Bruk svart/&hvite ikoner</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="213"/> - <source>Version</source> - <translation>Versjon</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="240"/> + <location filename="../src/gui/generalsettings.ui" line="220"/> <source>&Update Channel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="346"/> - <source>•</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="76"/> + <location filename="../src/gui/generalsettings.ui" line="102"/> <source>Edit &Ignored Files</source> <translation>Rediger &ignorerte filer</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="155"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="172"/> + <location filename="../src/gui/generalsettings.ui" line="93"/> <source>S&how crash reporter</source> <translation>Vis &krasj-rapportering</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="289"/> + <location filename="../src/gui/generalsettings.ui" line="269"/> <source>&Restart && Update</source> <translation>&Omstart && Oppdater</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="266"/> + <location filename="../src/gui/generalsettings.cpp" line="280"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="176"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>Change update channel?</source> <translation>Bytt oppdateringskanal? </translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="177"/> + <location filename="../src/gui/generalsettings.cpp" line="191"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1537,12 +1573,12 @@ Note that this selects only what pool upgrades are taken from, and that there ar Vær oppmerksom på at dette bare velger hvor oppgraderinger kommer ifra, og at nedgraderinger ikke er mulig. Så å gå tilbake fra beta-kanalen til den stabile kanalen, kan ikke gjøres umiddelbart og betyr å vente på en stabil versjon som er nyere enn den nåværende installerte betaen versjon.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="190"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Change update channel</source> <translation>Bytt oppdateringskanal</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="205"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -1579,63 +1615,53 @@ Vær oppmerksom på at dette bare velger hvor oppgraderinger kommer ifra, og at </message> <message> <location filename="../src/gui/ignorelisteditor.ui" line="20"/> - <source>Global Ignore Settings</source> - <translation>Globale ignorerings-innstillinger</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.ui" line="26"/> - <source>Sync hidden files</source> - <translation>Synkroniser skjulte filer</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.ui" line="36"/> <source>Files Ignored by Patterns</source> <translation>Filer som ignorerers av mønstre</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="75"/> + <location filename="../src/gui/ignorelisteditor.ui" line="59"/> <source>Add</source> <translation>Legg til</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="57"/> + <location filename="../src/gui/ignorelisteditor.ui" line="41"/> <source>Pattern</source> <translation>Mønster</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="62"/> + <location filename="../src/gui/ignorelisteditor.ui" line="46"/> <source>Allow Deletion</source> <translation>Tillat sletting</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="85"/> + <location filename="../src/gui/ignorelisteditor.ui" line="69"/> <source>Remove</source> <translation>Fjern</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="121"/> + <location filename="../src/gui/ignorelisteditor.ui" line="105"/> <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"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="119"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="112"/> <source>Could not open file</source> <translation>Klarte ikke å åpne fil</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="120"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="113"/> <source>Cannot write changes to '%1'.</source> <translation>Kan ikke skrive endringer til '%1'.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="146"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="132"/> <source>Add Ignore Pattern</source> <translation>Nytt mønster</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="147"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> <source>Add a new ignore pattern:</source> <translation>Legg til ignoreringsmønster:</translation> </message> @@ -1737,35 +1763,54 @@ Items where deletion is allowed will be deleted if they prevent a directory from <context> <name>OCC::LogBrowser</name> <message> - <location filename="../src/gui/logbrowser.cpp" line="46"/> + <location filename="../src/gui/logbrowser.ui" line="14"/> <source>Log Output</source> <translation>Logg</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="52"/> + <location filename="../src/gui/logbrowser.ui" line="116"/> + <source>Enable logging to temporary folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="61"/> + <source>Delete logs older than %1 hours</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="53"/> + <source><html><head/><body><p><span style=" font-weight:600; color:#ff0000;">The logs contain sensitive information which you should not make publicly available</span></p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="71"/> <source>The client can write debug logs to a temporary folder. These logs are very helpful for diagnosing problems. -Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space. -If enabled, logs will be written to %1</source> +Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="66"/> - <source>Enable logging to temporary folder</source> + <location filename="../src/gui/logbrowser.ui" line="84"/> + <source>If enabled, logs will be written to:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> - <source>Delete logs older than %1 hours</source> + <location filename="../src/gui/logbrowser.ui" line="91"/> + <source>C:/log</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.ui" line="123"/> + <source>Log Http traffic </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="143"/> <source>These settings persist across client restarts. Note that using any logging command line options will override the settings.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="85"/> + <location filename="../src/gui/logbrowser.ui" line="154"/> <source>Open folder</source> <translation>Åpne mappe</translation> </message> @@ -1773,12 +1818,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="186"/> + <location filename="../src/libsync/logger.cpp" line="177"/> <source>Error</source> <translation>Feil</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="187"/> + <location filename="../src/libsync/logger.cpp" line="178"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Fil '%1'<br/>kan ikke åpnes for skriving.<br/><br/>Loggen kan <b>ikke</b> lagres!</nobr></translation> </message> @@ -1953,23 +1998,23 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NotificationWidget</name> <message> - <location filename="../src/gui/notificationwidget.cpp" line="65"/> + <location filename="../src/gui/notificationwidget.cpp" line="59"/> <source>Created at %1</source> <translation>Opprettet %1</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="78"/> + <location filename="../src/gui/notificationwidget.cpp" line="72"/> <source>Closing in a few seconds...</source> <translation>Lukkes om noen sekunder...</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="125"/> + <location filename="../src/gui/notificationwidget.cpp" line="119"/> <source>%1 request failed at %2</source> <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment> <translation>%1 forespørsel feilet %2</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="131"/> + <location filename="../src/gui/notificationwidget.cpp" line="125"/> <source>'%1' selected at %2</source> <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment> <translation>'%1' valgt %2</translation> @@ -1978,68 +2023,73 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> + <location filename="../src/libsync/creds/oauth.cpp" line="127"/> <source>Error returned from the server: <em>%1</em></source> <translation>Feil returnert fra serveren: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="130"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>Det oppsto en feil med tilgang til "token" endepunktet: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="134"/> <source>Empty JSON from OAuth2 redirect</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="139"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Kunne ikke prosessere JSON returnert fra serveren:<br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="142"/> <source>Unsupported token type: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="151"/> + <location filename="../src/libsync/creds/oauth.cpp" line="144"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="153"/> + <location filename="../src/libsync/creds/oauth.cpp" line="146"/> <source>Unknown Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="291"/> + <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="157"/> + <location filename="../src/libsync/creds/oauth.cpp" line="150"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Innloggingsfeil</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="202"/> - <location filename="../src/libsync/creds/oauth.cpp" line="205"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="214"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="235"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>Feil bruker</h1><p>Du logget inn med bruker <em>%1</em>, men må logge inn med bruker <em>%2</em>.<br>Logg ut av %3 i en annen tab, <a href='%4'>klikk deretter her</a> og logg inn som bruker %2</p></translation> </message> @@ -2107,58 +2157,58 @@ kan be om flere rettigheter underveis.</translation> <context> <name>OCC::OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="50"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/> <source>Connect to %1</source> <translation>Koble til %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="52"/> <source>Setup local folder options</source> <translation>Sett opp valg for lokal mappe</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="60"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="61"/> <source>Connect...</source> <translation>Koble til...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/> - <source>Use &virtual files instead of downloading content immediately %1</source> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> + <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="84"/> - <source>(tech preview)</source> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> + <source>Use &virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="84"/> - <source>(experimental)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="177"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 mappe '%2' er synkronisert til lokal mappe '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="180"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <source>Sync the folder '%1'</source> <translation>Synkroniser mappen '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="185"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="202"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Advarsel:</strong> Den lokale mappen er ikke tom. Velg en løsning!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="283"/> + <source>Virtual files are not available for the selected folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="343"/> <source>Local Sync Folder</source> <translation>Lokal synkroniseringsmappe</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="352"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="387"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="377"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="412"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2217,17 +2267,17 @@ kan be om flere rettigheter underveis.</translation> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="44"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> <source>Connect to %1</source> <translation>Koble til %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> <source>Login in your browser</source> <translation>Logg inn i nettleseren din</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="55"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> <source>Copy link to clipboard</source> <translation>Kopier link til utklippstavlen</translation> </message> @@ -2235,39 +2285,39 @@ kan be om flere rettigheter underveis.</translation> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> <source>Connect to %1</source> <translation>Koble til %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> <source>Setup %1 server</source> <translation>Sett opp %1 server</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="132"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation>Denne url er IKKE sikker fordi den ikke er kryptert. Det er ikke tilrådelig å bruke den.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="136"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> <source>This url is secure. You can use it.</source> <translation>Denne url-en er sikker. Du kan bruke den.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="175"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> <source>&Next ></source> <translation>&Neste ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> <source>Invalid URL</source> <translation>Ugyldig URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Kunne ikke laste inn sertifikat. Kanskje feil passord?</translation> </message> @@ -2275,144 +2325,144 @@ Det er ikke tilrådelig å bruke den.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="251"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="226"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Vellykket oppkobling mot %1: %2 versjon %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Klarte ikke å koble til %1 på %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Tidsavbrudd ved oppkobling mot %1 på %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="291"/> <source>Trying to connect to %1 at %2...</source> <translation>Prøver å koble til %1 på %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>Autentisert forespørsel til serveren ble omdirigert til '%1'. URL-en er ugyldig, serveren er feilkonfigurert.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>Det kom et uventet svar fra en autentisert webdav-forespørsel.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Tilgang forbudt av serveren. For å sjekke om du har gyldig tilgang, <a href="%1">klikk her</a> for å aksessere tjenesten med nettleseren din.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/> <source>Invalid URL</source> <translation>Ugyldig URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="434"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Lokal synkroniseringsmappe %1 finnes allerede. Setter den opp for synkronisering.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>Oppretter lokal synkroniseringsmappe %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="443"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>feilet.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>Klarte ikke å opprette lokal mappe %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="471"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>Ingen ekstern mappe spesifisert!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="477"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Feil: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>oppretter mappe på ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="506"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>Ekstern mappe %1 ble opprettet.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Ekstern mappe %1 finnes allerede. Kobler den til for synkronisering.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Oppretting av mappe resulterte i HTTP-feilkode %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Oppretting av ekstern mappe feilet fordi påloggingsinformasjonen er feil!<br/>Gå tilbake og sjekk brukernavnet og passordet ditt.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Oppretting av ekstern mappe feilet, sannsynligvis fordi oppgitt påloggingsinformasjon er feil.</font><br/>Vennligst gå tilbake og sjekk ditt brukernavn og passord.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Oppretting av ekstern mappe %1 feilet med feil <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>En synkroniseringsforbindelse fra %1 til ekstern mappe %2 ble satt opp.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>Forbindelse til %1 opprettet!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Klarte ikke å etablere forbindelse til %1. Sjekk igjen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="567"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Omdøping av mappe feilet</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="568"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Kan ikke fjerne og sikkerhetskopiere mappen fordi mappen eller en fil i mappen er åpen i et annet program. Lukk mappen eller filen og prøv igjen, eller avbryt oppsettet.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Oppretting av lokal synkroniseringsmappe %1 vellykket!</b></font></translation> </message> @@ -2420,44 +2470,22 @@ Det er ikke tilrådelig å bruke den.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="78"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>%1 Veiviser for tilkobling</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="251"/> - <source>Enable technical preview feature?</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/> - <source>When the "virtual files" 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.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="260"/> - <source>Enable virtual files</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/> - <source>Continue to use selective sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="266"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation>Aktiver eksperimentelle funksjoner?</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="280"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="271"/> <source>Enable experimental placeholder mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="267"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/> <source>When the "virtual files" mode is enabled no files will be downloaded initially. Instead, a tiny "%1" 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. @@ -2468,7 +2496,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="281"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation>Hold deg trygg</translation> </message> @@ -2597,12 +2625,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1246"/> + <location filename="../src/libsync/discovery.cpp" line="1244"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1259"/> + <location filename="../src/libsync/discovery.cpp" line="1257"/> <source>Not allowed to remove, restoring</source> <translation>Ikke tillatt å fjerne, gjenoppretter</translation> </message> @@ -2622,17 +2650,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ikke tillatt fordi du ikke har lov til å opprette filer i den mappen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1223"/> + <location filename="../src/libsync/discovery.cpp" line="1222"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Ikke tillatt å laste opp denne filenfordi den er skrivebeskyttet på serveren, gjenoppretter</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1368"/> + <location filename="../src/libsync/discovery.cpp" line="1367"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1428"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation type="unfinished"/> </message> @@ -2640,7 +2668,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1001"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1006"/> <source>Error writing metadata to the database</source> <translation>Feil ved skriving av metadata til databasen</translation> </message> @@ -2710,22 +2738,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="147"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="146"/> <source>could not delete file %1, error: %2</source> <translation>klarte ikke å slette fil %1, feil: %2</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="162"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Merk! mulig sammenfall med %1 pga. sensitivitet for store/små bokstaver</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="168"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> <source>could not create folder %1</source> <translation>klarte ikke å opprette mappe %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="179"/> <source>Error writing metadata to the database</source> <translation>Feil ved skriving av metadata til databasen</translation> </message> @@ -2733,7 +2761,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="100"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Kunne ikke fjerne %1 på grunn av lokalt sammenfall av filnavn</translation> </message> @@ -2741,18 +2769,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="218"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Fil %1 kan ikke omdøpes til %2 på grunn av lokalt sammenfall av filnavn</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="249"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="255"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="248"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="254"/> <source>Error writing metadata to the database</source> <translation>Feil ved skriving av metadata til databasen</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="261"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> <source>Error setting pin state</source> <translation type="unfinished"/> </message> @@ -2831,7 +2859,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Opplasting av %1 overstiger kvoten for mappen</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="663"/> + <location filename="../src/libsync/propagateupload.cpp" line="677"/> <source>Error writing metadata to the database</source> <translation>Feil ved skriving av metadata til databasen</translation> </message> @@ -2872,14 +2900,14 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileTUS</name> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="202"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> - <translation type="unfinished"/> + <translation>Den lokale filen ble fjernet under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="213"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> - <translation type="unfinished"/> + <translation>Lokal fil endret under synkronisering.</translation> </message> </context> <context> @@ -3049,28 +3077,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SettingsDialog</name> <message> - <location filename="../src/gui/settingsdialog.cpp" line="117"/> + <location filename="../src/gui/settingsdialog.cpp" line="196"/> <source>Settings</source> <translation>Innstillinger</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="108"/> + <location filename="../src/gui/settingsdialog.cpp" line="187"/> <source>Activity</source> <translation>Aktivitet</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="128"/> - <location filename="../src/gui/settingsdialog.cpp" line="131"/> + <location filename="../src/gui/settingsdialog.cpp" line="176"/> + <source>Add account</source> + <translation>Legg til en konto</translation> + </message> + <message> + <location filename="../src/gui/settingsdialog.cpp" line="207"/> + <location filename="../src/gui/settingsdialog.cpp" line="210"/> <source>Quit %1</source> <translation>Avslutt %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="132"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="254"/> + <location filename="../src/gui/settingsdialog.cpp" line="342"/> <source>Account</source> <translation>Konto</translation> </message> @@ -3082,12 +3115,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/settingsdialog.ui" line="39"/> <source>Hide</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/settingsdialog.ui" line="49"/> - <source>toolBar</source> - <translation type="unfinished"/> + <translation>Skjul</translation> </message> </context> <context> @@ -3113,42 +3141,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud-sti:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="108"/> + <location filename="../src/gui/sharedialog.cpp" line="110"/> <source>%1 Sharing</source> <translation>%1-deling</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="86"/> + <location filename="../src/gui/sharedialog.cpp" line="88"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="105"/> + <location filename="../src/gui/sharedialog.cpp" line="107"/> <source>Folder: %2</source> <translation>Mappe: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="111"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>The server does not allow sharing</source> <translation>Serveren tillater ikke deling</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="127"/> + <location filename="../src/gui/sharedialog.cpp" line="129"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Henter maksimalt mulige delerettigheter fra serveren...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="197"/> + <location filename="../src/gui/sharedialog.cpp" line="202"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Filen kan ikke deles fordi den ble delt uten adgang til å dele.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="211"/> + <location filename="../src/gui/sharedialog.cpp" line="216"/> <source>Users and Groups</source> <translation>Brukere og grupper</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="218"/> + <location filename="../src/gui/sharedialog.cpp" line="223"/> <source>Public Links</source> <translation>Offentlige lenker</translation> </message> @@ -3343,32 +3371,32 @@ 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/shareusergroupwidget.cpp" line="210"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> <source>The item is not shared with any users or groups</source> <translation>Elementet deles ikke med noen brukere eller grupper</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="241"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> <source>Open link in browser</source> <translation>Åpne lenke i nettleser</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> <source>Copy link to clipboard</source> <translation>Kopier URL til utklippstavlen</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> <source>Send link by email</source> <translation>Send link i e-post</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="255"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> <source>No results for '%1'</source> <translation>Ingen resultater for '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> <source>I shared something with you</source> <translation>Jeg delte noe med deg</translation> </message> @@ -3402,17 +3430,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> <source>create</source> <translation>opprette</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> <source>change</source> <translation>endre</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> <source>delete</source> <translation>slett</translation> </message> @@ -3779,17 +3807,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Bare %1 er tilgjengelig, trenger minst %2 for å begynne</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="482"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation>Kan ikke åpne eller opprette den lokale synkroniseringsdatabasen. Kontroller at du har skrivetilgang i synkroniseringsmappen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1035"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Diskplass er lav: Nedlastinger som ville redusere ledig plass under% 1 ble hoppet over.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1042"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Det er ikke nok ledig plass på serveren for noen av opplastingene.</translation> </message> @@ -3804,27 +3832,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="498"/> <source>Using virtual files with suffix, but suffix is not set</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="515"/> + <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>Unable to read the blacklist from the local database</source> <translation>Kan ikke lese svartelisten fra den lokale databasen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="546"/> + <location filename="../src/libsync/syncengine.cpp" line="541"/> <source>Unable to read from the sync journal.</source> <translation>Kan ikke lese fra synkroniseringsjournalen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="630"/> + <location filename="../src/libsync/syncengine.cpp" line="625"/> <source>Cannot open the sync journal</source> <translation>Kan ikke åpne synkroniseringsjournalen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1018"/> <source>Aborted</source> <translation type="unfinished"/> </message> @@ -3840,279 +3868,276 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="341"/> - <source><p>Version %2. For more information visit <a href="%3">https://%4</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Hannah von Reth, and others.</small></p></source> + <location filename="../src/libsync/theme.cpp" line="382"/> + <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/libsync/theme.cpp" line="348"/> - <source><p>Copyright ownCloud GmbH</p></source> - <translation><p>Copyright ownCloud GmbH</p></translation> - </message> - <message> - <location filename="../src/libsync/theme.cpp" line="349"/> - <source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source> - <translation><p>Distribuert av %1 og lisensiert under GNU General Public License (GPL) Version 2.0.<br/>%2 og %2-logoet er registrerte varemerker for %1 i USA, i andre land eller begge deler.</p></translation> - </message> </context> <context> <name>OCC::ValidateChecksumHeader</name> <message> - <location filename="../src/common/checksums.cpp" line="335"/> + <location filename="../src/common/checksums.cpp" line="330"/> <source>The checksum header is malformed.</source> <translation>Sjekksum-headeren har feil format.</translation> </message> <message> - <location filename="../src/common/checksums.cpp" line="362"/> + <location filename="../src/common/checksums.cpp" line="357"/> <source>The checksum header contained an unknown checksum type '%1'</source> <translation>Sjekksum-header inneholdt ukjent sjekksum-type '%1'</translation> </message> <message> - <location filename="../src/common/checksums.cpp" line="366"/> - <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> + <location filename="../src/common/checksums.cpp" line="361"/> + <source>The downloaded file does not match the checksum, it will be resumed. '%1' != '%2'</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Vfs</name> + <message> + <location filename="../src/common/vfs.cpp" line="72"/> + <source>The Virtual filesystem feature requires a NTFS file system, %1 is using %2</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="267"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Please sign in</source> <translation>Vennligst logg inn</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="313"/> + <location filename="../src/gui/owncloudgui.cpp" line="304"/> <source>Folder %1: %2</source> <translation>Mappe %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Ingen synkroniseringsmapper er konfigurert.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="340"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Åpne i nettleser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="389"/> - <location filename="../src/gui/owncloudgui.cpp" line="712"/> - <location filename="../src/gui/owncloudgui.cpp" line="806"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Log in...</source> <translation>Logg inn..</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="393"/> - <location filename="../src/gui/owncloudgui.cpp" line="704"/> - <location filename="../src/gui/owncloudgui.cpp" line="808"/> + <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Log out</source> <translation>Logg ut</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="499"/> + <location filename="../src/gui/owncloudgui.cpp" line="490"/> <source>Recent Changes</source> <translation>Siste endringer</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="358"/> <source>Managed Folders:</source> <translation>Administrerte mapper:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="361"/> <source>Open folder '%1'</source> <translation>Åpne mappe '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="342"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Åpne %1 i nettleser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="190"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="789"/> + <location filename="../src/gui/owncloudgui.cpp" line="780"/> <source>Unknown status</source> <translation>Ukjent status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Settings...</source> <translation>Innstillinger...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>Details...</source> <translation>Detaljer...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="799"/> + <location filename="../src/gui/owncloudgui.cpp" line="790"/> <source>Help</source> <translation>Hjelp</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="803"/> + <location filename="../src/gui/owncloudgui.cpp" line="794"/> <source>Quit %1</source> <translation>Avslutt %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="248"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Disconnected from %1</source> <translation>Koble fra %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="198"/> + <location filename="../src/gui/owncloudgui.cpp" line="189"/> <source>Unsupported Server Version</source> <translation>Server-versjonen støttes ikke</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="238"/> + <location filename="../src/gui/owncloudgui.cpp" line="229"/> <source>Disconnected</source> <translation>Frakoblet</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="240"/> + <location filename="../src/gui/owncloudgui.cpp" line="231"/> <source>Disconnected from some accounts</source> <translation>Frakoblet noen kontoer</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from accounts:</source> <translation>Koblet fra kontoer:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="253"/> + <location filename="../src/gui/owncloudgui.cpp" line="244"/> <source>Account %1: %2</source> <translation>Konto %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> <source>Signed out</source> <translation>Logget ut</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="272"/> + <location filename="../src/gui/owncloudgui.cpp" line="263"/> <source>Account synchronization is disabled</source> <translation>Kontosynkronisering er deaktivert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="264"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>Synkronisering er satt på pause</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="321"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>Unresolved conflicts</source> <translation>Uløste konflikter</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="328"/> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Feil under synkronisering</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>Ingen synkronisering-mapper konfigurert.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="378"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Unpause all folders</source> <translation>Fortsett alle mapper</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="383"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> <source>Pause all folders</source> <translation>Sett alle mapper på pause</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="683"/> + <location filename="../src/gui/owncloudgui.cpp" line="674"/> <source>Unpause all synchronization</source> <translation>Fortsett all synkronisering</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="685"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause synchronization</source> <translation>Fortsett synkronisering</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="693"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Pause all synchronization</source> <translation>Sett all synkronisering på pause</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause synchronization</source> <translation>Sett synkronisering på pause</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="702"/> + <location filename="../src/gui/owncloudgui.cpp" line="693"/> <source>Log out of all accounts</source> <translation>Logg ut av alle kontoer</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="710"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> <source>Log in to all accounts...</source> <translation>Logg inn på alle kontoer...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>New account...</source> <translation>Ny konto...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="801"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>About %1</source> <translation>Om %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="834"/> + <location filename="../src/gui/owncloudgui.cpp" line="825"/> <source>No items synced recently</source> <translation>Ingenting synkronisert nylig</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="856"/> + <location filename="../src/gui/owncloudgui.cpp" line="847"/> <source>Checking for changes in remote '%1'</source> <translation>Sjekker for endringer i ekstern '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in local '%1'</source> <translation>Sjekker for endringer i lokal '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="874"/> + <location filename="../src/gui/owncloudgui.cpp" line="865"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Synkroniserer %1 av %2 (%3 gjenstår)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="879"/> + <location filename="../src/gui/owncloudgui.cpp" line="870"/> <source>Syncing %1 of %2</source> <translation>Synkroniserer %1 av %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="888"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 (%2 left)</source> <translation>Synkroniserer %1 (%2 gjenstår)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="891"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1</source> <translation>Synkroniserer %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="909"/> + <location filename="../src/gui/owncloudgui.cpp" line="899"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> <source>Up to date</source> <translation>Oppdatert</translation> </message> @@ -4126,84 +4151,82 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="52"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="108"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="214"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="317"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="490"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="501"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="135"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="234"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="553"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="564"/> <source>TextLabel</source> <translation>Tekst-etikett</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="62"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="86"/> <source>Server</source> <translation>Server</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="415"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="477"/> <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source> <translation><html><head/><body><p>Hvis det settes kryss i denne boksen, vil eksisterende innhold i den lokale mappen bli slettet for å starte en ren synkronisering fra serveren.</p><p>Ikke sett kryss for dette hvis det lokale innholdet skal lastes opp til mappen på serveren.</p></body></html></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="418"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="480"/> <source>Start a &clean sync (Erases the local folder!)</source> <translation>Start en &ren synkronisering (sletter den lokale mappen!)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="152"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="192"/> <source>Ask for confirmation before synchroni&zing folders larger than</source> <translation>Be om bekreftelse før synkronisering av mapper større enn</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="169"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="209"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="178"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="218"/> <source>Ask for confirmation before synchronizing e&xternal storages</source> <translation>Be om bekreftelse før synkronisering av e&ksterne lagre</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="207"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="227"/> <source>Choose what to sync</source> <translation>Velg hva som synkroniseres</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="272"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="275"/> <source><html><head/><body><p>When this option is selected, the wizard will close without synchronizing anything. You can use the &quot;Add Folder Sync Connection&quot; button from the account settings to choose which pair of local and remote folder you wish to synchronize</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="253"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/> <source>Manually create folder sync connections </source> <translation>Manuelt opprett mappesynk koblinger. </translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="333"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> <source>&Local Folder</source> <translation>&Lokal mappe</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="374"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="436"/> <source>pbSelectLocalFolder</source> <translation>pbSelectLocalFolder</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="405"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="467"/> <source>&Keep local data</source> <translation>&Behold lokale data</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="125"/> <source>S&ynchronize everything from server (recommended)</source> <translation>Synkroniser alt fra serveren (anbefalt)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="435"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="498"/> <source>Status message</source> <translation>Statusmelding</translation> </message> @@ -4258,7 +4281,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="196"/> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> <source>TextLabel</source> <translation>Tekst-etikett</translation> </message> @@ -4273,7 +4296,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="160"/> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> <source>Error Label</source> <translation>Feiletikett</translation> </message> @@ -4305,37 +4328,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>fram i tid</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="444"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>i går</numerusform><numerusform>for %n dager siden</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>for %n time siden</numerusform><numerusform>for %n timer siden</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="457"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>nå</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="459"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>For mindre enn et minutt siden</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="462"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>for %n minutt siden</numerusform><numerusform>for %n minutter siden</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>For en stund siden</translation> </message> @@ -4369,37 +4392,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="316"/> + <location filename="../src/common/utility.cpp" line="317"/> <source>%n year(s)</source> <translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="317"/> + <location filename="../src/common/utility.cpp" line="318"/> <source>%n month(s)</source> <translation><numerusform>%n måned</numerusform><numerusform>%n måneder</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="319"/> <source>%n day(s)</source> <translation><numerusform>%n dag</numerusform><numerusform>%n dager</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n hour(s)</source> <translation><numerusform>%n time</numerusform><numerusform>%n timer</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n minute(s)</source> <translation><numerusform>%n minutt</numerusform><numerusform>%n minutter</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n second(s)</source> <translation><numerusform>%n sekund</numerusform><numerusform>%n sekunder</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="345"/> + <location filename="../src/common/utility.cpp" line="346"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4418,11 +4441,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>ownCloudTheme::about()</name> + <name>ownCloudTheme::aboutVersions()</name> + <message> + <location filename="../src/libsync/theme.cpp" line="360"/> + <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ownCloudTheme::qtVer</name> + <message> + <location filename="../src/libsync/theme.cpp" line="350"/> + <source>%1 (Built against Qt %1)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="320"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> - <translation><p><small>Bygget fra Git-revisjon <a href="%1">%2</a> %3, %4 med Qt %5, %6</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="355"/> + <source>%1 %2</source> + <translation>%1 %2</translation> </message> </context> <context> @@ -4528,52 +4567,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Status udefinert</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>Venter på å starte synkronisering</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>Synkronisering pågår</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Synkronisering vellykket</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>Vellykket synkronisering. Noen filer ble ignorert.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Synkroniseringsfeil</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Feil i oppsett</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>Forbereder synkronisering</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>Avbryter...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>Synkronisering er satt på pause</translation> </message> @@ -4581,53 +4620,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>utility</name> <message> - <location filename="../src/gui/guiutility.cpp" line="38"/> + <location filename="../src/gui/guiutility.cpp" line="39"/> <source>Could not open browser</source> <translation>Kunne ikke åpne nettleseren</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="39"/> + <location filename="../src/gui/guiutility.cpp" line="40"/> <source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source> <translation>Det oppstod en feil ved start av nettleseren for å gå til URL %1. Kanskje ingen standard nettleser er konfigurert?</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="62"/> + <location filename="../src/gui/guiutility.cpp" line="63"/> <source>Could not open email client</source> <translation>Klarte ikke å åpne epost-klient</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="63"/> + <location filename="../src/gui/guiutility.cpp" line="64"/> <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source> <translation>Det oppstod en feil ved oppstart av epost-klienten for å lage en ny melding. Kanskje ingen standard epost-klient er konfigurert?</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="78"/> + <location filename="../src/gui/guiutility.cpp" line="79"/> <source>Always available locally</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="82"/> + <location filename="../src/gui/guiutility.cpp" line="83"/> <source>Some available online only</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="84"/> - <location filename="../src/gui/guiutility.cpp" line="86"/> + <location filename="../src/gui/guiutility.cpp" line="85"/> + <location filename="../src/gui/guiutility.cpp" line="87"/> <source>Available online only</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="80"/> + <location filename="../src/gui/guiutility.cpp" line="81"/> <source>Currently available locally</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="93"/> + <location filename="../src/gui/guiutility.cpp" line="94"/> <source>Make always available locally</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="98"/> + <location filename="../src/gui/guiutility.cpp" line="99"/> <source>Free up local space</source> <translation type="unfinished"/> </message> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index feefe2f74..bdff41831 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -146,7 +146,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="131"/> + <location filename="../src/libsync/account.cpp" line="121"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -517,12 +517,12 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 op %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 op %2 (niet verbonden)</translation> </message> @@ -1490,7 +1490,7 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <message> <location filename="../src/gui/generalsettings.ui" line="242"/> <source>beta</source> - <translation type="unfinished"/> + <translation>beta</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="337"/> @@ -2070,7 +2070,7 @@ Note that using any logging command line options will override the settings.</so <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="295"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation type="unfinished"/> @@ -2081,21 +2081,21 @@ Note that using any logging command line options will override the settings.</so <translation><h1>Inlog fout<p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="206"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="218"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="239"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation>1 Verkeerde gebruiker 1 2 U bent ingelogd met user 3 %1 3, maar dient ingelogd te zijn met user 4 %2 4. 5 Log %3 alstublieft uit in een andere tabblad, vervolgens 6 klikt u hier 6 en log-in als user %2 2</translation> </message> @@ -2351,17 +2351,17 @@ We adviseren deze site niet te gebruiken.</translation> <translation>Probeer te verbinden met %1 om %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>De geauthentiseerde aanvraag voor de server werd omgeleid naar '%1'. De URL is onjuist, de server is verkeerd geconfigureerd.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>Er was een ongeldig antwoord op een geauthenticeerde webdav opvraging</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="370"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Toegang door server verboden. Om te verifiëren dat u toegang mag hebben, <a href="%1">klik hier</a> om met uw browser toegang tot de service te krijgen.</translation> </message> @@ -2371,104 +2371,104 @@ We adviseren deze site niet te gebruiken.</translation> <translation>Ongeldige URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Lokale synch map %1 bestaat al, deze wordt ingesteld voor synchronisatie.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="427"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>Creëren lokale sync map %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="433"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>mislukt.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="435"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>Kon lokale map %1 niet aanmaken</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>Geen externe map opgegeven!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Fout: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="480"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>aanmaken map op ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>Externe map %1 succesvol gecreërd.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>De remote map %1 bestaat al. Verbinden voor synchroniseren.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="502"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Het aanmaken van de map resulteerde in HTTP foutcode %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="504"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.<br/>Ga terug en controleer uw inloggegevens.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.</font><br/>ga terug en controleer uw inloggevens.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Aanmaken van remote map %1 mislukt met fout <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Er is een sync verbinding van %1 naar remote directory %2 opgezet.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>Succesvol verbonden met %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Verbinding met %1 niet geslaagd. Probeer het nog eens.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Hernoemen map mislukt</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Kan de map niet verwijderen en backuppen, omdat de map of een bestand daarin, geopend is in een ander programma. Sluit de map of het bestand en drup op Opnieuw of annuleer de installatie.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="610"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Lokale synch map %1 is succesvol aangemaakt!</b></font></translation> </message> @@ -2608,7 +2608,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/discovery.cpp" line="400"/> <source>size</source> - <translation type="unfinished"/> + <translation>grootte</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="402"/> @@ -3875,7 +3875,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="357"/> + <location filename="../src/libsync/theme.cpp" line="382"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4335,37 +4335,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>in de toekomst</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>%n dag geleden</numerusform><numerusform>%n dagen geleden</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>%n uur geleden</numerusform><numerusform>%n uur geleden</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>nu</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>Minder dan een minuut geleden</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>%n minuut geleden</numerusform><numerusform>%n minuten geleden</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>Even geleden</translation> </message> @@ -4450,7 +4450,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="332"/> + <location filename="../src/libsync/theme.cpp" line="360"/> <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> <translation type="unfinished"/> </message> @@ -4458,7 +4458,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="322"/> + <location filename="../src/libsync/theme.cpp" line="350"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4466,7 +4466,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="327"/> + <location filename="../src/libsync/theme.cpp" line="355"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4574,52 +4574,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Ongedefinieerde status</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>In afwachting van synchronisatie</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>Bezig met synchroniseren</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Synchronisatie geslaagd</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>Synchronisatie geslaagd, sommige bestanden werden genegeerd.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Synchronisatiefout</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Installatiefout</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>Voorbereiden synchronisatie</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>Aan het afbreken...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>Synchronisatie is gepauzeerd</translation> </message> diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 01e0dff49..36ba67ed5 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -146,7 +146,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="131"/> + <location filename="../src/libsync/account.cpp" line="121"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -518,12 +518,12 @@ Ta czynność spowoduje przerwanie obecnie działającej synchronizacji. <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 na %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 na %2 (rozłączony)</translation> </message> @@ -2071,7 +2071,7 @@ Note that using any logging command line options will override the settings.</so <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="295"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation type="unfinished"/> @@ -2082,21 +2082,21 @@ Note that using any logging command line options will override the settings.</so <translation><h1>Błąd logowania</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="206"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="218"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="239"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation type="unfinished"/> </message> @@ -2352,17 +2352,17 @@ Niezalecane jest jego użycie.</translation> <translation>Próba połączenia z %1 w %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="370"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Dostęp zabroniony przez serwer. Aby sprawdzić, czy masz odpowiednie uprawnienia, kliknij <a href="%1">tutaj</a>, aby połączyć się z usługą poprzez przeglądarkę.</translation> </message> @@ -2372,104 +2372,104 @@ Niezalecane jest jego użycie.</translation> <translation>Błędny adres url.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Lokalny folder synchronizacji %1 już istnieje. Ustawiam go do synchronizacji.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="427"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>Tworzenie lokalnego folderu synchronizacji %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>OK</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="433"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>Błąd.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="435"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>Nie udało się utworzyć lokalnego folderu %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>Nie określono folderu zdalnego!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Błąd: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="480"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>tworzę folder na ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>Zdalny folder %1 został utworzony pomyślnie.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Zdalny folder %1 już istnieje. Podłączam go do synchronizowania.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="502"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Tworzenie folderu spowodowało kod błędu HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="504"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Nie udało się utworzyć zdalnego folderu ponieważ podane dane dostępowe są nieprawidłowe!<br/>Wróć i sprawdź podane dane dostępowe.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Tworzenie folderu zdalnego nie powiodło się. Prawdopodobnie dostarczone poświadczenia są błędne.</font><br/>Wróć i sprawdź poświadczenia.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Tworzenie folderu zdalnego %1 nie powiodło się z powodu błędu <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Połączenie synchronizacji z %1 do katalogu zdalnego %2 zostało utworzone.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>Udane połączenie z %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Połączenie z %1 nie może być nawiązane. Sprawdź ponownie.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Zmiana nazwy folderu nie powiodła się</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Nie można usunąć i zarchiwizować folderu ponieważ znajdujący się w nim plik lub folder jest otwarty przez inny program. Proszę zamknąć folder lub plik albo kliknąć ponów lub anuluj setup.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="610"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Utworzenie lokalnego folderu synchronizowanego %1 zakończone pomyślnie!</b></font></translation> </message> @@ -3875,7 +3875,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="357"/> + <location filename="../src/libsync/theme.cpp" line="382"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4336,37 +4336,37 @@ Kliknij</translation> <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>w przyszłości</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>%n dzień temu</numerusform><numerusform>%n dni temu</numerusform><numerusform>%n dni temu</numerusform><numerusform>%n dni temu</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>%n godzinę temu</numerusform><numerusform>%n godziny temu</numerusform><numerusform>%n godzin temu</numerusform><numerusform>%n godzin temu</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>teraz</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>Mniej niż minutę temu</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>%n minutę temu</numerusform><numerusform>%n minuty temu</numerusform><numerusform>%n minut temu</numerusform><numerusform>%n minut temu</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>Jakiś czas temu</translation> </message> @@ -4451,7 +4451,7 @@ Kliknij</translation> <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="332"/> + <location filename="../src/libsync/theme.cpp" line="360"/> <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> <translation type="unfinished"/> </message> @@ -4459,7 +4459,7 @@ Kliknij</translation> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="322"/> + <location filename="../src/libsync/theme.cpp" line="350"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4467,7 +4467,7 @@ Kliknij</translation> <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="327"/> + <location filename="../src/libsync/theme.cpp" line="355"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4575,52 +4575,52 @@ Kliknij</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Stan niezdefiniowany</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>Trwa oczekiwanie na uruchomienie synchronizacji</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>Synchronizacja uruchomiona</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Udana synchronizacja</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>Synchronizacja ukończona, niektóre pliki zostały zignorowane.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Błąd synchronizacji</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Błąd ustawień</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>Przygotowuję do synchronizacji</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>Anuluję...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>Synchronizacja wstrzymana</translation> </message> diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 03b7b620b..528fab660 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -13,7 +13,7 @@ <translation>Não foi possível mover '%1' para '%2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="445"/> + <location filename="../src/common/filesystembase.cpp" line="442"/> <source>Moving to the trash is not implemented on this platform</source> <translation type="unfinished"/> </message> @@ -87,22 +87,45 @@ <translation>Formulário</translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="58"/> + <location filename="../src/gui/notificationwidget.ui" line="73"/> <source>Lorem ipsum dolor sit amet</source> <translation>Lorem ipsum dolor sit amet</translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="71"/> + <location filename="../src/gui/notificationwidget.ui" line="86"/> <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source> <translation>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm</translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="91"/> + <location filename="../src/gui/notificationwidget.ui" line="106"/> <source>TextLabel</source> <translation>EtiquetaTexto</translation> </message> </context> <context> + <name>OCC::AboutDialog</name> + <message> + <location filename="../src/gui/aboutdialog.ui" line="24"/> + <source>About</source> + <translation>Sobre</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.ui" line="88"/> + <source>TextLabel</source> + <translation>EtiquetaTexto</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.ui" line="96"/> + <source>Versions</source> + <translation>Versões</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.cpp" line="28"/> + <source>About %1</source> + <translation>Sobre %1</translation> + </message> +</context> +<context> <name>OCC::AbstractNetworkJob</name> <message> <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> @@ -121,6 +144,14 @@ </message> </context> <context> + <name>OCC::Account</name> + <message> + <location filename="../src/libsync/account.cpp" line="121"/> + <source>%1@%2</source> + <translation>%1@%2</translation> + </message> +</context> +<context> <name>OCC::AccountSettings</name> <message> <location filename="../src/gui/accountsettings.ui" line="14"/> @@ -163,15 +194,15 @@ <translation>Aplicar alterações manuais</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="267"/> + <location filename="../src/gui/accountsettings.ui" line="282"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="254"/> - <location filename="../src/gui/accountsettings.cpp" line="512"/> - <location filename="../src/gui/accountsettings.cpp" line="624"/> - <location filename="../src/gui/accountsettings.cpp" line="1083"/> + <location filename="../src/gui/accountsettings.ui" line="269"/> + <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="611"/> + <location filename="../src/gui/accountsettings.cpp" line="1048"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -181,87 +212,67 @@ <translation>Ligado ao <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="180"/> <source>No account configured.</source> <translation>Nenhuma conta configurada.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="200"/> - <source>Add new</source> - <translation>Adicionar nova</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="209"/> + <location filename="../src/gui/accountsettings.cpp" line="203"/> <source>Remove</source> <translation>Remover</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="213"/> + <location filename="../src/gui/accountsettings.cpp" line="207"/> <source>Account</source> <translation>Conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="297"/> <source>Choose what to sync</source> <translation>Escolher o que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Force sync now</source> <translation>Forçar a sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="305"/> <source>Restart sync</source> <translation>Retomar sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="327"/> + <location filename="../src/gui/accountsettings.cpp" line="314"/> <source>Remove folder sync connection</source> <translation>Remover ligação de sincronização de pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>Enable virtual file support %1...</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>(tech preview)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>(experimental)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="445"/> + <location filename="../src/gui/accountsettings.cpp" line="433"/> <source>Folder creation failed</source> <translation>Não foi possível criar a pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="434"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Não foi possível criar a pasta local<i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="504"/> + <location filename="../src/gui/accountsettings.cpp" line="491"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmar Remoção da Ligação de Sincronização de Pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="511"/> + <location filename="../src/gui/accountsettings.cpp" line="499"/> <source>Remove Folder Sync Connection</source> <translation>Remover Ligação da Sincronização de Pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="615"/> + <location filename="../src/gui/accountsettings.cpp" line="602"/> <source>Disable virtual file support?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="616"/> + <location filename="../src/gui/accountsettings.cpp" line="603"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -270,173 +281,183 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="623"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Disable support</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="733"/> + <location filename="../src/gui/accountsettings.cpp" line="712"/> <source>Sync Running</source> <translation>Sincronização em Execução</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="734"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>A operação de sincronização está em execução.<br/>Deseja terminá-la?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="829"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>%1 in use</source> <translation>%1 em utilização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="856"/> + <location filename="../src/gui/accountsettings.cpp" line="836"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="845"/> <source>Connected to %1.</source> <translation>Ligado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="870"/> + <location filename="../src/gui/accountsettings.cpp" line="850"/> <source>Server %1 is temporarily unavailable.</source> <translation>O servidor %1 está temporariamente indisponível.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is currently in maintenance mode.</source> <translation>O Servidor %1 encontra-se em manutenção</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="876"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Signed out from %1.</source> <translation>Terminou a sessão de %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="886"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Connecting to %1...</source> <translation>A Conectar a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="871"/> <source>No connection to %1 at %2.</source> <translation>Sem ligação para %1 em %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="930"/> + <location filename="../src/gui/accountsettings.cpp" line="910"/> <source>Log in</source> <translation>Iniciar Sessão</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1026"/> + <location filename="../src/gui/accountsettings.cpp" line="1005"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Existem pastas que não foram sincronizadas por serem demasiado grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1028"/> + <location filename="../src/gui/accountsettings.cpp" line="1007"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Existem pastas que não foram sincronizadas por serem armazenamento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1029"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Existem pastas que não foram sincronizadas por serem demasiado grandes ou armazenamento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1075"/> + <location filename="../src/gui/accountsettings.cpp" line="1041"/> <source>Confirm Account Removal</source> <translation>Confirmar Remoção da Conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1076"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Deseja mesmo remover a ligação da conta <i>%1</i>?</p><p><b>Nota:</b> isto <b>não</b> irá eliminar quaisquer ficheiros.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1082"/> + <location filename="../src/gui/accountsettings.cpp" line="1047"/> <source>Remove connection</source> <translation>Remover ligação</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="306"/> + <location filename="../src/gui/accountsettings.cpp" line="293"/> <source>Open folder</source> <translation>Abrir pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="205"/> - <location filename="../src/gui/accountsettings.cpp" line="932"/> + <location filename="../src/gui/accountsettings.cpp" line="199"/> + <location filename="../src/gui/accountsettings.cpp" line="912"/> <source>Log out</source> <translation>Terminar sessão</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="265"/> + <location filename="../src/gui/accountsettings.cpp" line="252"/> <source>Open local folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="273"/> + <location filename="../src/gui/accountsettings.cpp" line="260"/> <source>Open folder in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="324"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Resume sync</source> <translation>Retomar sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="324"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Pause sync</source> <translation>Pausar sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="331"/> + <location filename="../src/gui/accountsettings.cpp" line="318"/> <source>Availability</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="348"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source>Disable virtual file support...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="505"/> + <location filename="../src/gui/accountsettings.cpp" line="343"/> + <source>Enable virtual file support%1...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="343"/> + <source> (experimental)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="492"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Deseja mesmo parar a sincronização da pasta <i>%1</i>?</p><p><b>Nota:</b> isto <b>não</b> irá eliminar qualquer ficheiro.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="816"/> + <location filename="../src/gui/accountsettings.cpp" line="796"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 em utilização. Algumas pastas, incluindo a rede montada ou as pastas partilhadas, podem ter limites diferentes.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="817"/> + <location filename="../src/gui/accountsettings.cpp" line="797"/> <source>%1 of %2 in use</source> <translation>%1 de %2 em utilização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="826"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Currently there is no storage usage information available.</source> <translation>Atualmente não está disponível nenhuma informação da utilização do armazenamento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="863"/> + <location filename="../src/gui/accountsettings.cpp" line="843"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="883"/> + <location filename="../src/gui/accountsettings.cpp" line="863"/> <source>Obtaining authorization from the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="896"/> + <location filename="../src/gui/accountsettings.cpp" line="876"/> <source>Server configuration error: %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="907"/> + <location filename="../src/gui/accountsettings.cpp" line="887"/> <source>No %1 connection configured.</source> <translation>%1 sem ligação configurada.</translation> </message> @@ -492,12 +513,12 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 em %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 em %2 (desligado)</translation> </message> @@ -513,44 +534,44 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="515"/> - <location filename="../src/gui/activitywidget.cpp" line="563"/> + <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="570"/> <source>Server Activity</source> <translation>Atividade do Servidor</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Protocolo de Sincronização</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>Não Sincronizado</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="574"/> + <location filename="../src/gui/activitywidget.cpp" line="581"/> <source>Not Synced (%1)</source> <extracomment>%1 is the number of not synced files.</extracomment> <translation>Não Sincronizado (%1)</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="606"/> + <location filename="../src/gui/activitywidget.cpp" line="613"/> <source>The server activity list has been copied to the clipboard.</source> <translation>A lista de atividades do servidor foi copiada para a área de transferência.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="610"/> + <location filename="../src/gui/activitywidget.cpp" line="617"/> <source>The sync activity list has been copied to the clipboard.</source> <translation>A lista de atividades de sincronização foi copiada para a área de transferência.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="613"/> + <location filename="../src/gui/activitywidget.cpp" line="620"/> <source>The list of unsynced items has been copied to the clipboard.</source> <translation>A lista de itens não sincronizados foi copiada para a área de transferência.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="618"/> + <location filename="../src/gui/activitywidget.cpp" line="625"/> <source>Copied to clipboard</source> <translation>Copiado para a área de transferência</translation> </message> @@ -570,47 +591,47 @@ This action will abort any currently running synchronization.</source> <translation>EtiquetaTexto</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Atividades do Servidor</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="93"/> + <location filename="../src/gui/activitywidget.cpp" line="100"/> <source>Copy the activity list to the clipboard.</source> <translation>Copiar a lista de actividades para a área de transferência.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Notificações</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="351"/> + <location filename="../src/gui/activitywidget.cpp" line="358"/> <source>%n notifications(s) for %1.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="357"/> + <location filename="../src/gui/activitywidget.cpp" line="364"/> <source>%n notifications(s) for %1 and %2.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="359"/> + <location filename="../src/gui/activitywidget.cpp" line="366"/> <source>New notifications for %1, %2 and other accounts.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="362"/> + <location filename="../src/gui/activitywidget.cpp" line="369"/> <source>Open the activity view for details.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="145"/> + <location filename="../src/gui/activitywidget.cpp" line="152"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>A conta %1 não tem atividades ativadas.</translation> </message> @@ -661,42 +682,42 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="134"/> + <location filename="../src/gui/application.cpp" line="136"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="138"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="142"/> + <location filename="../src/gui/application.cpp" line="144"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="149"/> + <location filename="../src/gui/application.cpp" line="151"/> <source>Quit</source> <translation>Sair</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="150"/> + <location filename="../src/gui/application.cpp" line="152"/> <source>Continue</source> <translation>Continuar</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="299"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Error accessing the configuration file</source> <translation>Erro a aceder ao ficheiro de configuração</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="300"/> + <location filename="../src/gui/application.cpp" line="310"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Ocorreu um erro enquanto se acedia ao ficheiro de configuração em %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="303"/> + <location filename="../src/gui/application.cpp" line="313"/> <source>Quit ownCloud</source> <translation>Sair do ownCloud</translation> </message> @@ -727,7 +748,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1135"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1140"/> <source>Error writing metadata to the database</source> <translation>Erro ao gravar os metadados para a base de dados</translation> </message> @@ -769,7 +790,7 @@ This action will abort any currently running synchronization.</source> <name>OCC::DiscoverySingleDirectoryJob</name> <message> <location filename="../src/libsync/discoveryphase.cpp" line="480"/> - <location filename="../src/libsync/discoveryphase.cpp" line="502"/> + <location filename="../src/libsync/discoveryphase.cpp" line="501"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation type="unfinished"/> </message> @@ -805,135 +826,135 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="172"/> + <location filename="../src/gui/folder.cpp" line="173"/> <source>Local folder %1 does not exist.</source> <translation>A pasta local %1 não existe.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="175"/> + <location filename="../src/gui/folder.cpp" line="176"/> <source>%1 should be a folder but is not.</source> <translation>%1 deveria ser uma pasta, mas não é.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="178"/> + <location filename="../src/gui/folder.cpp" line="179"/> <source>%1 is not readable.</source> <translation>%1 não é legível.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 foi removido.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 foi atualizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 foi renomeado para %2</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2.</source> <translation>%1 foi movido para %2</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="414"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>'%1' e %n outro(s) ficheiro(s) foram removidos</numerusform><numerusform>'%1' e %n outros ficheiros foram removidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="420"/> + <location filename="../src/gui/folder.cpp" line="421"/> <source>%1 and %n other file(s) have been added.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="427"/> + <location filename="../src/gui/folder.cpp" line="428"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 e %n outro ficheiro foram actualizados.</numerusform><numerusform>%1 e %n outros ficheiros foram actualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="434"/> + <location filename="../src/gui/folder.cpp" line="435"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 foi renomeado para %2 e %n outro ficheiro foi renomeado.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros ficheiros foram renomeados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="441"/> + <location filename="../src/gui/folder.cpp" line="442"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 foi movido para %2 e %n outro ficheiro foi movido.</numerusform><numerusform>%1 foi movido para %2 e %n outros ficheiros foram movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="448"/> + <location filename="../src/gui/folder.cpp" line="449"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 tem e %n outro ficheiro têm problemas de sincronização.</numerusform><numerusform>%1 tem e %n outros ficheiros têm problemas de sincronização.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 tem um problema de sincronização. Por favor, verifique o ficheiro com conflito!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="455"/> + <location filename="../src/gui/folder.cpp" line="456"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 e %n outro ficheiro não podem ser sincronizados devido a erros. Consulte o registo de eventos para mais detalhes.</numerusform><numerusform>%1 e %n outros ficheiros não podem ser sincronizados devido a erros. Consulte o registo de eventos para mais detalhes.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>Não foi possível sincronizar %1 devido a um erro. Consulte o registo para detalhes.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="463"/> + <location filename="../src/gui/folder.cpp" line="464"/> <source>Sync Activity</source> <translation>Atividade de Sincronização</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="800"/> <source>Could not read system exclude file</source> <translation>Não foi possível ler o ficheiro excluir do sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1045"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Foi adicionada uma nova pasta maior que %1 MB: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>A folder from an external storage has been added. </source> <translation>Foi adicionada uma pasta vinda de armazenamento externo. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1049"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Por favor, vá às configurações para a selecionar se a desejar transferir.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1109"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1112"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <source>Changes in synchronized folders could not be tracked reliably. This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default). @@ -942,7 +963,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1208"/> + <location filename="../src/gui/folder.cpp" line="1197"/> <source>All files in the sync folder '%1' folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to keep the files, they will be re-synced with the server if you have rights to do so. @@ -953,7 +974,7 @@ Se decidir manter os ficheiros, eles serão sincronizados novamento para o servi Se decidir apagar os ficheiros, eles ficaram indisponíveis para si, a não ser que seja o seu proprietário.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1202"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -962,17 +983,17 @@ Tem a certeza que deseja sincronizar essas ações com o servidor? Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados novamente apartir do servidor.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1217"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>Remover todos os ficheiros?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Remover todos os ficheiros</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Manter ficheiros</translation> </message> @@ -980,107 +1001,107 @@ Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados n <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="357"/> <source>Could not reset folder state</source> <translation>Não foi possível reiniciar o estado da pasta</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="356"/> + <location filename="../src/gui/folderman.cpp" line="358"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Foi encontrado um 'journal' de sincronização, mas não foi possível removê-lo. Por favor, certifique-se que nenhuma aplicação o está a utilizar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation>(cópia de segurança)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation>(cópia de segurança %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Undefined State.</source> <translation>Estado indefinido.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1332"/> <source>Waiting to start syncing.</source> <translation>A aguardar para iniciar a sincronização.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>Preparing for sync.</source> <translation>A preparar para sincronizar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1336"/> + <location filename="../src/gui/folderman.cpp" line="1338"/> <source>Sync is running.</source> <translation>A sincronização está em execução.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync was successful, unresolved conflicts.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1343"/> + <location filename="../src/gui/folderman.cpp" line="1345"/> <source>Last Sync was successful.</source> <translation>A última sincronização foi bem sucedida.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>Erro de instalação.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>Abortado pelo utilizador.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>Sync is paused.</source> <translation>A sincronização está pausada.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1361"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>%1 (Sync is paused)</source> <translation>%1 (A sincronização está pausada)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1369"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <source>No valid folder selected!</source> <translation>Não foi selecionada nenhuma pasta válida!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path does not exist!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1382"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>The selected path is not a folder!</source> <translation>O caminho selecionado não é uma pasta!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1391"/> <source>You have no permission to write to the selected folder!</source> <translation>Não tem permissão para gravar para a pasta selecionada!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1456"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Já existe uma sincronização do servidor para esta pasta local. Por favor escolha outra pasta local!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1436"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>A pasta local %1 já contém uma pasta utilizada numa ligação de sincronização de pasta. Por favor, escolha outra!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1442"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>A pasta local %1 já contém uma pasta usada numa ligação de sincronização de pasta. Por favor, escolha outra!</translation> </message> @@ -1088,16 +1109,11 @@ Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados n <context> <name>OCC::FolderStatusDelegate</name> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="47"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="46"/> <source>Add Folder Sync Connection</source> <translation>Adicionar Ligação de Sincronização de Pasta</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="248"/> - <source>Synchronizing with local folder</source> - <translation>A sincronizar com a pasta local</translation> - </message> - <message> <location filename="../src/gui/folderstatusdelegate.cpp" line="299"/> <source>File</source> <translation>Ficheiro</translation> @@ -1148,107 +1164,117 @@ Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados n <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <source>Synchronizing VirtualFiles with local folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <source>Synchronizing with local folder</source> + <translation>A sincronizar com a pasta local</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>A sincronizar %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>transferir %s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>enviar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 restante, %1 de %2, ficheiro %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, ficheiro %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> <source>file %1 of %2</source> <translation>ficheiro %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> <source>Waiting...</source> <translation>A aguardar...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>A aguardar por %n outra pasta...</numerusform><numerusform>A aguardar por %n outra(s) pasta(s)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> <source>Preparing to sync...</source> <translation>A preparar para sincronizar...</translation> </message> @@ -1272,12 +1298,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="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <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="576"/> + <location filename="../src/gui/folderwizard.cpp" line="578"/> <source>Add Sync Connection</source> <translation>Adicionar Ligação de Sincronização</translation> </message> @@ -1285,17 +1311,17 @@ Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados n <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="68"/> + <location filename="../src/gui/folderwizard.cpp" line="69"/> <source>Click to select a local folder to sync.</source> <translation>Clique para selecionar a pasta local para sincronizar.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="75"/> + <location filename="../src/gui/folderwizard.cpp" line="76"/> <source>Enter the path to the local folder.</source> <translation>Insira o caminho para a pasta local.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="136"/> + <location filename="../src/gui/folderwizard.cpp" line="137"/> <source>Select the source folder</source> <translation>Selecione a pasta de origem</translation> </message> @@ -1303,52 +1329,52 @@ Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados n <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="184"/> + <location filename="../src/gui/folderwizard.cpp" line="185"/> <source>Create Remote Folder</source> <translation>Criar Pasta Remota</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="185"/> + <location filename="../src/gui/folderwizard.cpp" line="186"/> <source>Enter the name of the new folder to be created below '%1':</source> <translation>Insira o nome da nova pasta para ser criada em baixo '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="215"/> + <location filename="../src/gui/folderwizard.cpp" line="216"/> <source>Folder was successfully created on %1.</source> <translation>A pasta foi criada com sucesso em %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="226"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Authentication failed accessing %1</source> <translation>A autenticação falhou ao aceder %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="228"/> + <location filename="../src/gui/folderwizard.cpp" line="229"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Não foi possível criar a pasta em %1. Por favor, verifique manualmente.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="247"/> <source>Failed to list a folder. Error: %1</source> <translation>Não foi possível listar uma pasta. Erro: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="328"/> <source>Choose this to sync the entire account</source> <translation>Escolha isto para sincronizar a conta completa</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="440"/> <source>This folder is already being synced.</source> <translation>Esta pasta já foi sincronizada.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="442"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Já está a sincronizar <i>%1</i>, que é uma pasta de origem de <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="444"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1356,30 +1382,30 @@ Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados n <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> - <source>Use virtual files instead of downloading content immediately %1</source> + <location filename="../src/gui/folderwizard.cpp" line="485"/> + <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="489"/> - <source>(tech preview)</source> + <location filename="../src/gui/folderwizard.cpp" line="485"/> + <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="489"/> - <source>(experimental)</source> + <location filename="../src/gui/folderwizard.cpp" line="519"/> + <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="49"/> + <location filename="../src/gui/folderwizard.cpp" line="50"/> <source><b>Warning:</b> %1</source> <translation><b>Aviso:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="51"/> + <location filename="../src/gui/folderwizard.cpp" line="52"/> <source><b>Warning:</b></source> <translation><b>Aviso:</b></translation> </message> @@ -1389,12 +1415,12 @@ Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados n <message> <location filename="../src/libsync/propagatedownload.cpp" line="180"/> <source>No E-Tag received from server, check Proxy/Gateway</source> - <translation type="unfinished"/> + <translation>Nenhum E-Tag recebida do servidor, verifique Proxy / Acesso</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="187"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> - <translation type="unfinished"/> + <translation>Nós recebemos uma E-Tag diferente para retomar. Tentar da próxima vez.</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="197"/> @@ -1404,7 +1430,7 @@ Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados n <message> <location filename="../src/libsync/propagatedownload.cpp" line="224"/> <source>Server returned wrong content-range</source> - <translation type="unfinished"/> + <translation>O servidor devolveu o alcance-conteúdo errado</translation> </message> </context> <context> @@ -1428,48 +1454,73 @@ Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados n <translation>Configuração Geral</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="55"/> - <source>For System Tray</source> - <translation>Para a Bandeja do Sistema</translation> + <location filename="../src/gui/generalsettings.ui" line="80"/> + <source>Sync hidden files</source> + <translation>Sincronizar os ficheiros ocultados</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="184"/> - <source>Network</source> + <location filename="../src/gui/generalsettings.ui" line="109"/> + <source>Log Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="257"/> + <location filename="../src/gui/generalsettings.ui" line="136"/> + <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="196"/> + <source>Network</source> + <translation>Rede</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="208"/> + <source>Updates</source> + <translation>Atualizações</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="237"/> <source>stable</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="262"/> + <location filename="../src/gui/generalsettings.ui" line="242"/> <source>beta</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="68"/> + <location filename="../src/gui/generalsettings.ui" line="337"/> + <source>About</source> + <translation>Sobre</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="65"/> <source>Advanced</source> <translation>Avançada</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="100"/> + <location filename="../src/gui/generalsettings.ui" line="41"/> + <source>Use &Monochrome Icons in the system tray</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="144"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Pedir confirmação antes de sincronizar pastas maiores que</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="120"/> + <location filename="../src/gui/generalsettings.ui" line="164"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="186"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Pedir confirmação antes de sincronizar armazenamentos externos</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="41"/> + <location filename="../src/gui/generalsettings.ui" line="55"/> <source>&Launch on System Startup</source> <translation>&Iniciar no Arranque do Sistema</translation> </message> @@ -1479,69 +1530,54 @@ Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados n <translation>Mostrar Notificações no &Ambiente de Trabalho</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="58"/> - <source>Use &Monochrome Icons</source> - <translation>Utilizar Ícones &Monocromáticos</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="213"/> - <source>Version</source> - <translation>Versão</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="240"/> + <location filename="../src/gui/generalsettings.ui" line="220"/> <source>&Update Channel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="346"/> - <source>•</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="76"/> + <location filename="../src/gui/generalsettings.ui" line="102"/> <source>Edit &Ignored Files</source> <translation>Editar Ficheiros &Ignorados</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="155"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="172"/> + <location filename="../src/gui/generalsettings.ui" line="93"/> <source>S&how crash reporter</source> <translation>M&ostrar relatório de crache</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="289"/> + <location filename="../src/gui/generalsettings.ui" line="269"/> <source>&Restart && Update</source> <translation>&Reiniciar e Atualizar</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="266"/> + <location filename="../src/gui/generalsettings.cpp" line="280"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="176"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>Change update channel?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="177"/> + <location filename="../src/gui/generalsettings.cpp" line="191"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="190"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Change update channel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="205"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -1578,63 +1614,53 @@ Note that this selects only what pool upgrades are taken from, and that there ar </message> <message> <location filename="../src/gui/ignorelisteditor.ui" line="20"/> - <source>Global Ignore Settings</source> - <translation>Definições Globais de Ignorar</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.ui" line="26"/> - <source>Sync hidden files</source> - <translation>Sincronizar os ficheiros ocultados</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.ui" line="36"/> <source>Files Ignored by Patterns</source> <translation>Ficheiros Ignorados por Padrões</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="75"/> + <location filename="../src/gui/ignorelisteditor.ui" line="59"/> <source>Add</source> <translation>Adicionar</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="57"/> + <location filename="../src/gui/ignorelisteditor.ui" line="41"/> <source>Pattern</source> <translation>Padrão</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="62"/> + <location filename="../src/gui/ignorelisteditor.ui" line="46"/> <source>Allow Deletion</source> <translation>Permitir Eliminação</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="85"/> + <location filename="../src/gui/ignorelisteditor.ui" line="69"/> <source>Remove</source> <translation>Remover</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="121"/> + <location filename="../src/gui/ignorelisteditor.ui" line="105"/> <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"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="119"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="112"/> <source>Could not open file</source> <translation>Não foi possível abrir o ficheiro</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="120"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="113"/> <source>Cannot write changes to '%1'.</source> <translation>Não foi possível gravar as alterações para '%1'</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="146"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="132"/> <source>Add Ignore Pattern</source> <translation>Adicione Padrão de ignorar</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="147"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> <source>Add a new ignore pattern:</source> <translation>Adicione um novo padrão de ignorar:</translation> </message> @@ -1735,35 +1761,54 @@ Items where deletion is allowed will be deleted if they prevent a directory from <context> <name>OCC::LogBrowser</name> <message> - <location filename="../src/gui/logbrowser.cpp" line="46"/> + <location filename="../src/gui/logbrowser.ui" line="14"/> <source>Log Output</source> <translation>Registo de Saída</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="52"/> + <location filename="../src/gui/logbrowser.ui" line="116"/> + <source>Enable logging to temporary folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="61"/> + <source>Delete logs older than %1 hours</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="53"/> + <source><html><head/><body><p><span style=" font-weight:600; color:#ff0000;">The logs contain sensitive information which you should not make publicly available</span></p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="71"/> <source>The client can write debug logs to a temporary folder. These logs are very helpful for diagnosing problems. -Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space. -If enabled, logs will be written to %1</source> +Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="66"/> - <source>Enable logging to temporary folder</source> + <location filename="../src/gui/logbrowser.ui" line="84"/> + <source>If enabled, logs will be written to:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> - <source>Delete logs older than %1 hours</source> + <location filename="../src/gui/logbrowser.ui" line="91"/> + <source>C:/log</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.ui" line="123"/> + <source>Log Http traffic </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="143"/> <source>These settings persist across client restarts. Note that using any logging command line options will override the settings.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="85"/> + <location filename="../src/gui/logbrowser.ui" line="154"/> <source>Open folder</source> <translation>Abrir pasta</translation> </message> @@ -1771,12 +1816,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="186"/> + <location filename="../src/libsync/logger.cpp" line="177"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="187"/> + <location filename="../src/libsync/logger.cpp" line="178"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>O ficheiro '%1'<br/>não pode ser aberto para gravação.<br/><br/>O ficheiro de registo de saída <b>não</b> pode ser guardado!</nobr></translation> </message> @@ -1951,23 +1996,23 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NotificationWidget</name> <message> - <location filename="../src/gui/notificationwidget.cpp" line="65"/> + <location filename="../src/gui/notificationwidget.cpp" line="59"/> <source>Created at %1</source> <translation>Criado às %1</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="78"/> + <location filename="../src/gui/notificationwidget.cpp" line="72"/> <source>Closing in a few seconds...</source> <translation>A fechar dentro de alguns segundos...</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="125"/> + <location filename="../src/gui/notificationwidget.cpp" line="119"/> <source>%1 request failed at %2</source> <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment> <translation>%1 pedido falhou a %2</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="131"/> + <location filename="../src/gui/notificationwidget.cpp" line="125"/> <source>'%1' selected at %2</source> <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment> <translation>'%1' selecionado a %2</translation> @@ -1976,68 +2021,73 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> + <location filename="../src/libsync/creds/oauth.cpp" line="127"/> <source>Error returned from the server: <em>%1</em></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="130"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="134"/> <source>Empty JSON from OAuth2 redirect</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="139"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Não foi possível processar a resposta JSON retornada pelo servidor: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="142"/> <source>Unsupported token type: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="151"/> + <location filename="../src/libsync/creds/oauth.cpp" line="144"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="153"/> + <location filename="../src/libsync/creds/oauth.cpp" line="146"/> <source>Unknown Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="291"/> + <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="157"/> + <location filename="../src/libsync/creds/oauth.cpp" line="150"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Erro no login</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="202"/> - <location filename="../src/libsync/creds/oauth.cpp" line="205"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="214"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="235"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation type="unfinished"/> </message> @@ -2105,58 +2155,58 @@ poderá pedir por privilégios adicionais durante o processo.</translation> <context> <name>OCC::OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="50"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/> <source>Connect to %1</source> <translation>Ligar a %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="52"/> <source>Setup local folder options</source> <translation>Configurar as opções de pasta local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="60"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="61"/> <source>Connect...</source> <translation>Ligar...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/> - <source>Use &virtual files instead of downloading content immediately %1</source> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> + <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="84"/> - <source>(tech preview)</source> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> + <source>Use &virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="84"/> - <source>(experimental)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="177"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 pasta '%2' é sincronizada para pasta local '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="180"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <source>Sync the folder '%1'</source> <translation>Sincronizar a pasta '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="185"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="202"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Aviso:</strong> a pasta local não está vazia. Escolha uma resolução!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="283"/> + <source>Virtual files are not available for the selected folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="343"/> <source>Local Sync Folder</source> <translation>Pasta de Sincronização Local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="352"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="387"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="377"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="412"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2215,17 +2265,17 @@ poderá pedir por privilégios adicionais durante o processo.</translation> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="44"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> <source>Connect to %1</source> <translation>Ligar a %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> <source>Login in your browser</source> <translation>Faça login através do browser</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="55"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> <source>Copy link to clipboard</source> <translation>Copiar ligação para a área de transferência</translation> </message> @@ -2233,39 +2283,39 @@ poderá pedir por privilégios adicionais durante o processo.</translation> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> <source>Connect to %1</source> <translation>Ligar a %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> <source>Setup %1 server</source> <translation>Configurar servidor %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="132"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation>Este url NÃO é seguro, porque este não está encriptado. Não é aconselhada a sua utilização.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="136"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> <source>This url is secure. You can use it.</source> <translation>Este url é seguro. Pode utilizá-lo.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="175"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> <source>&Next ></source> <translation>&Seguinte ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> <source>Invalid URL</source> <translation>URL inválido</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2273,144 +2323,144 @@ Não é aconselhada a sua utilização.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="251"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="226"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> <translation><font color="green">Ligado com sucesso a %1: %2 - versão: %3 (%4)</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Não foi possível ligar a %1 em %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Tempo expirou enquanto tentava ligar a %1 em %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="291"/> <source>Trying to connect to %1 at %2...</source> <translation>A tentar ligar a %1 em %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>O pedido de autenticação para o servidor foi redirecionado para '%1'. O URL é mau, o servidor está mal configurado. </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>Houve uma resposta inválida para o pedido de autenticação webdav</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Acesso proibido pelo servidor. Para verificar que tem o acesso adequado, <a href="%1">clique aqui</a> para aceder ao serviço com o seu navegador.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/> <source>Invalid URL</source> <translation>URL inválido</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="434"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>A pasta de sincronização local %1 já existe, a configurar para sincronizar.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>A criar a pasta de sincronização local %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="443"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>Falhou.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>Não foi possível criar a pasta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="471"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>Não foi indicada a pasta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="477"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>a criar a pasta na ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="506"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>Criação da pasta remota %1 com sucesso!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>A pasta remota %1 já existe. Ligue-a para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>A criação da pasta resultou num erro HTTP com o código %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>A criação da pasta remota falhou, provavelmente por ter introduzido as credenciais erradas.<br/>Por favor, verifique as suas credenciais.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">A criação da pasta remota falhou, provavelmente por ter introduzido as credenciais erradas.</font><br/>Por favor, verifique as suas credenciais.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>A criação da pasta remota %1 falhou com o erro <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>A sincronização de %1 com a pasta remota %2 foi criada com sucesso.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>Conectado com sucesso a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Não foi possível ligar a %1 . Por Favor verifique novamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="567"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Erro ao renomear a pasta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="568"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Não é possível remover e fazer backup à pasta porque a pasta ou um ficheiro nesta está aberto em outro programa. Por favor, feche a pasta ou o ficheiro e clique novamente ou cancele a configuração.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Pasta de sincronização local %1 criada com sucesso!</b></font></translation> </message> @@ -2418,44 +2468,22 @@ Não é aconselhada a sua utilização.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="78"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>Assistente de ligação %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="251"/> - <source>Enable technical preview feature?</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/> - <source>When the "virtual files" 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.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="260"/> - <source>Enable virtual files</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/> - <source>Continue to use selective sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="266"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation>Ativar funcionalidades experimentais</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="280"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="271"/> <source>Enable experimental placeholder mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="267"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/> <source>When the "virtual files" mode is enabled no files will be downloaded initially. Instead, a tiny "%1" 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. @@ -2466,7 +2494,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="281"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation type="unfinished"/> </message> @@ -2595,12 +2623,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1246"/> + <location filename="../src/libsync/discovery.cpp" line="1244"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1259"/> + <location filename="../src/libsync/discovery.cpp" line="1257"/> <source>Not allowed to remove, restoring</source> <translation>Não autorizado para remoção, restaurando</translation> </message> @@ -2620,17 +2648,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Não permitido, porque não tem permissão para adicionar os ficheiros nessa pasta</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1223"/> + <location filename="../src/libsync/discovery.cpp" line="1222"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Não é permitido enviar este ficheiro porque este é só de leitura no servidor, a restaurar</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1368"/> + <location filename="../src/libsync/discovery.cpp" line="1367"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1428"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation type="unfinished"/> </message> @@ -2638,7 +2666,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1001"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1006"/> <source>Error writing metadata to the database</source> <translation>Erro ao escrever a meta-informação par a base de dados</translation> </message> @@ -2708,22 +2736,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="147"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="146"/> <source>could not delete file %1, error: %2</source> <translation>Não foi possivel eliminar o ficheiro %1, erro: %2</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="162"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>Atenção, possível sensibilidade a maiúsculas em conflito com %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="168"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> <source>could not create folder %1</source> <translation>Não foi possivel criar a pasta %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="179"/> <source>Error writing metadata to the database</source> <translation>Erro ao escrever a meta-informação par a base de dados</translation> </message> @@ -2731,7 +2759,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="100"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> <source>Could not remove %1 because of a local file name clash</source> <translation>Nao foi possivel remover %1 devido a conflito local com nome de ficheiro</translation> </message> @@ -2739,18 +2767,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="218"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>O ficheiro %1 nao pode ser renomeado para %2 devido a conflito com nome de ficheiro local</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="249"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="255"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="248"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="254"/> <source>Error writing metadata to the database</source> <translation>Erro ao escrever a meta-informação par a base de dados</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="261"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> <source>Error setting pin state</source> <translation type="unfinished"/> </message> @@ -2829,7 +2857,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/libsync/propagateupload.cpp" line="663"/> + <location filename="../src/libsync/propagateupload.cpp" line="677"/> <source>Error writing metadata to the database</source> <translation>Erro ao gravar os metadados para a base de dados</translation> </message> @@ -2870,14 +2898,14 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileTUS</name> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="202"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> - <translation type="unfinished"/> + <translation>O arquivo local foi removido durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="213"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> - <translation type="unfinished"/> + <translation>Ficheiro local alterado durante a sincronização.</translation> </message> </context> <context> @@ -3047,28 +3075,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SettingsDialog</name> <message> - <location filename="../src/gui/settingsdialog.cpp" line="117"/> + <location filename="../src/gui/settingsdialog.cpp" line="196"/> <source>Settings</source> <translation>Definições</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="108"/> + <location filename="../src/gui/settingsdialog.cpp" line="187"/> <source>Activity</source> <translation>Atividade</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="128"/> - <location filename="../src/gui/settingsdialog.cpp" line="131"/> + <location filename="../src/gui/settingsdialog.cpp" line="176"/> + <source>Add account</source> + <translation>Adicionar conta</translation> + </message> + <message> + <location filename="../src/gui/settingsdialog.cpp" line="207"/> + <location filename="../src/gui/settingsdialog.cpp" line="210"/> <source>Quit %1</source> <translation>Sair do %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="132"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="254"/> + <location filename="../src/gui/settingsdialog.cpp" line="342"/> <source>Account</source> <translation>Conta</translation> </message> @@ -3080,12 +3113,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/settingsdialog.ui" line="39"/> <source>Hide</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/settingsdialog.ui" line="49"/> - <source>toolBar</source> - <translation type="unfinished"/> + <translation>Ocultar</translation> </message> </context> <context> @@ -3111,42 +3139,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Caminho OwnCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="108"/> + <location filename="../src/gui/sharedialog.cpp" line="110"/> <source>%1 Sharing</source> <translation>%1 Partilhando</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="86"/> + <location filename="../src/gui/sharedialog.cpp" line="88"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="105"/> + <location filename="../src/gui/sharedialog.cpp" line="107"/> <source>Folder: %2</source> <translation>Pasta: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="111"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>The server does not allow sharing</source> <translation>O servidor não permite partilhas</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="127"/> + <location filename="../src/gui/sharedialog.cpp" line="129"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>A obter do servidor as permissões máximas de partilha...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="197"/> + <location filename="../src/gui/sharedialog.cpp" line="202"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>O ficheiro não pode ser partilhado porque foi partilhado sem permissão de partilha.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="211"/> + <location filename="../src/gui/sharedialog.cpp" line="216"/> <source>Users and Groups</source> <translation>Utilizadores e Grupos</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="218"/> + <location filename="../src/gui/sharedialog.cpp" line="223"/> <source>Public Links</source> <translation>Ligações públicas</translation> </message> @@ -3341,32 +3369,32 @@ 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/shareusergroupwidget.cpp" line="210"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> <source>The item is not shared with any users or groups</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="241"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> <source>Open link in browser</source> <translation>Abrir ligação no navegador</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> <source>Copy link to clipboard</source> <translation>Copiar endereço para a área de transferência</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> <source>Send link by email</source> <translation>Enviar hiperligação por correio eletrónico</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="255"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> <source>No results for '%1'</source> <translation>Sem resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> <source>I shared something with you</source> <translation type="unfinished"/> </message> @@ -3400,17 +3428,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> <source>create</source> <translation>criar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> <source>change</source> <translation>alterar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> <source>delete</source> <translation>eliminar</translation> </message> @@ -3777,17 +3805,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Apenas %1 estão disponíveis, é preciso um mínimo de %2 para começar</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="482"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1035"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1042"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> @@ -3802,27 +3830,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="498"/> <source>Using virtual files with suffix, but suffix is not set</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="515"/> + <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>Unable to read the blacklist from the local database</source> <translation>Não foi possível ler a lista negra a partir da base de dados local</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="546"/> + <location filename="../src/libsync/syncengine.cpp" line="541"/> <source>Unable to read from the sync journal.</source> <translation>Não foi possível ler a partir do jornal de sincronização.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="630"/> + <location filename="../src/libsync/syncengine.cpp" line="625"/> <source>Cannot open the sync journal</source> <translation>Impossível abrir o jornal de sincronismo</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1018"/> <source>Aborted</source> <translation type="unfinished"/> </message> @@ -3838,279 +3866,276 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="341"/> - <source><p>Version %2. For more information visit <a href="%3">https://%4</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Hannah von Reth, and others.</small></p></source> + <location filename="../src/libsync/theme.cpp" line="382"/> + <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/libsync/theme.cpp" line="348"/> - <source><p>Copyright ownCloud GmbH</p></source> - <translation><p>Todos os direitos reservados ownCloud GmbH</p></translation> - </message> - <message> - <location filename="../src/libsync/theme.cpp" line="349"/> - <source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source> - <translation><p>Distribuído por %1 e licenciado sob a GNU General Public License (GPL) Versão 2.0.<br/>%2 e o logótipo %2 são marcas registadas da %1 nos Estados Unidos, outros países, ou ambos </p></translation> - </message> </context> <context> <name>OCC::ValidateChecksumHeader</name> <message> - <location filename="../src/common/checksums.cpp" line="335"/> + <location filename="../src/common/checksums.cpp" line="330"/> <source>The checksum header is malformed.</source> <translation>O cabeçalho de "checksum" está com problemas.</translation> </message> <message> - <location filename="../src/common/checksums.cpp" line="362"/> + <location filename="../src/common/checksums.cpp" line="357"/> <source>The checksum header contained an unknown checksum type '%1'</source> <translation>O header checksum continha um tipo de checksum desconhecido '%1'</translation> </message> <message> - <location filename="../src/common/checksums.cpp" line="366"/> - <source>The downloaded file does not match the checksum, it will be resumed.</source> - <translation>O ficheiro transferido não corresponde ao "checksum", Este irá ser retomado.</translation> + <location filename="../src/common/checksums.cpp" line="361"/> + <source>The downloaded file does not match the checksum, it will be resumed. '%1' != '%2'</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Vfs</name> + <message> + <location filename="../src/common/vfs.cpp" line="72"/> + <source>The Virtual filesystem feature requires a NTFS file system, %1 is using %2</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="267"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Please sign in</source> <translation>Por favor inicie a sessão</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="313"/> + <location filename="../src/gui/owncloudgui.cpp" line="304"/> <source>Folder %1: %2</source> <translation>Pasta %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Não há pastas de sincronização configurado.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="340"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Abrir no navegador</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="389"/> - <location filename="../src/gui/owncloudgui.cpp" line="712"/> - <location filename="../src/gui/owncloudgui.cpp" line="806"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Log in...</source> <translation>Iniciar sessão...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="393"/> - <location filename="../src/gui/owncloudgui.cpp" line="704"/> - <location filename="../src/gui/owncloudgui.cpp" line="808"/> + <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Log out</source> <translation>Terminar sessão</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="499"/> + <location filename="../src/gui/owncloudgui.cpp" line="490"/> <source>Recent Changes</source> <translation>Alterações recentes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="358"/> <source>Managed Folders:</source> <translation>Pastas Geridas:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="361"/> <source>Open folder '%1'</source> <translation>Abrir pasta '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="342"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Abrir %1 no navegador</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="190"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="789"/> + <location filename="../src/gui/owncloudgui.cpp" line="780"/> <source>Unknown status</source> <translation>Estado desconhecido</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Settings...</source> <translation>Configurações...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>Details...</source> <translation>Detalhes...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="799"/> + <location filename="../src/gui/owncloudgui.cpp" line="790"/> <source>Help</source> <translation>Ajuda</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="803"/> + <location filename="../src/gui/owncloudgui.cpp" line="794"/> <source>Quit %1</source> <translation>Sair do %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="248"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Disconnected from %1</source> <translation>Desconetado de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="198"/> + <location filename="../src/gui/owncloudgui.cpp" line="189"/> <source>Unsupported Server Version</source> <translation>Versão de servidor não suportada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="238"/> + <location filename="../src/gui/owncloudgui.cpp" line="229"/> <source>Disconnected</source> <translation>Desligado</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="240"/> + <location filename="../src/gui/owncloudgui.cpp" line="231"/> <source>Disconnected from some accounts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from accounts:</source> <translation>Desconetado das contas:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="253"/> + <location filename="../src/gui/owncloudgui.cpp" line="244"/> <source>Account %1: %2</source> <translation>Conta %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> <source>Signed out</source> <translation>Sessão terminada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="272"/> + <location filename="../src/gui/owncloudgui.cpp" line="263"/> <source>Account synchronization is disabled</source> <translation>A sincronização de contas está desactivada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="264"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="321"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>Unresolved conflicts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="328"/> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Erro durante a sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="378"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Unpause all folders</source> <translation>Continuar todas as pastas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="383"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> <source>Pause all folders</source> <translation>Pausar todas as pastas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="683"/> + <location filename="../src/gui/owncloudgui.cpp" line="674"/> <source>Unpause all synchronization</source> <translation>Continuar toda a sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="685"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause synchronization</source> <translation>Continuar sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="693"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Pause all synchronization</source> <translation>Pausar toda a sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause synchronization</source> <translation>Pausar sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="702"/> + <location filename="../src/gui/owncloudgui.cpp" line="693"/> <source>Log out of all accounts</source> <translation>Sair de todas as contas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="710"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> <source>Log in to all accounts...</source> <translation>Entrar em todas as contas...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>New account...</source> <translation>Nova conta...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="801"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>About %1</source> <translation>Sobre %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="834"/> + <location filename="../src/gui/owncloudgui.cpp" line="825"/> <source>No items synced recently</source> <translation>Sem itens sincronizados recentemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="856"/> + <location filename="../src/gui/owncloudgui.cpp" line="847"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="874"/> + <location filename="../src/gui/owncloudgui.cpp" line="865"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Sincronizar %1 de %2 (%3 faltando)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="879"/> + <location filename="../src/gui/owncloudgui.cpp" line="870"/> <source>Syncing %1 of %2</source> <translation>A sincronizar %1 de %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="888"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 (%2 left)</source> <translation>A sincronizar %1 (%2 em falta)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="891"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1</source> <translation>A sincronizar %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="909"/> + <location filename="../src/gui/owncloudgui.cpp" line="899"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> <source>Up to date</source> <translation>Atualizado</translation> </message> @@ -4124,84 +4149,82 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="52"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="108"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="214"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="317"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="490"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="501"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="135"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="234"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="553"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="564"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="62"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="86"/> <source>Server</source> <translation>Servidor</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="415"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="477"/> <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source> <translation><html><head/><body><p>Se esta caixa estiver selecionada, o conteúdo existente na pasta local será eliminado e será iniciada uma nova sincronização a partir dos dados do servidor.</p><p>Não selecione esta caixa se os dados locais tiverem de ser enviados para a pasta do servidor.</p></body></html></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="418"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="480"/> <source>Start a &clean sync (Erases the local folder!)</source> <translation>&Iniciar uma nova sincronização (Apaga a pasta local)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="152"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="192"/> <source>Ask for confirmation before synchroni&zing folders larger than</source> <translation>Pedir confirmação antes de sincronizar pastas maiores que</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="169"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="209"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="178"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="218"/> <source>Ask for confirmation before synchronizing e&xternal storages</source> <translation>Pedir confirmação antes de sincronizar armazenamentos e&xteriores</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="207"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="227"/> <source>Choose what to sync</source> <translation>Escolher o que sincronizar</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="272"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="275"/> <source><html><head/><body><p>When this option is selected, the wizard will close without synchronizing anything. You can use the &quot;Add Folder Sync Connection&quot; button from the account settings to choose which pair of local and remote folder you wish to synchronize</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="253"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/> <source>Manually create folder sync connections </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="333"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> <source>&Local Folder</source> <translation>Pasta &Local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="374"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="436"/> <source>pbSelectLocalFolder</source> <translation>Seleccione Pasta local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="405"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="467"/> <source>&Keep local data</source> <translation>&Manter dados locais</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="125"/> <source>S&ynchronize everything from server (recommended)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="435"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="498"/> <source>Status message</source> <translation>Mensagem de estado</translation> </message> @@ -4256,7 +4279,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="196"/> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -4271,7 +4294,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="160"/> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> <source>Error Label</source> <translation>Erro Etiqueta</translation> </message> @@ -4303,37 +4326,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>no futuro</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="444"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>%n dia atrás</numerusform><numerusform>%n dias atrás</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>%n hora atrás</numerusform><numerusform>%n horas atrás</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="457"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>agora</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="459"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>Menos de um minuto atrás</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="462"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>%n minuto atrás</numerusform><numerusform>%n minutos atrás</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>Algum tempo atrás</translation> </message> @@ -4367,37 +4390,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="316"/> + <location filename="../src/common/utility.cpp" line="317"/> <source>%n year(s)</source> <translation><numerusform>%n ano</numerusform><numerusform>%n ano(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="317"/> + <location filename="../src/common/utility.cpp" line="318"/> <source>%n month(s)</source> <translation><numerusform>%n mês</numerusform><numerusform>%n meses</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="319"/> <source>%n day(s)</source> <translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n hour(s)</source> <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n minute(s)</source> <translation><numerusform>%n minuto</numerusform><numerusform>%n minutos</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n second(s)</source> <translation><numerusform>%n segundo</numerusform><numerusform>%n segundos</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="345"/> + <location filename="../src/common/utility.cpp" line="346"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4416,11 +4439,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>ownCloudTheme::about()</name> + <name>ownCloudTheme::aboutVersions()</name> + <message> + <location filename="../src/libsync/theme.cpp" line="360"/> + <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ownCloudTheme::qtVer</name> + <message> + <location filename="../src/libsync/theme.cpp" line="350"/> + <source>%1 (Built against Qt %1)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="320"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> - <translation><p><small>Construído a partir da revisão Git <a href="%1">%2</a> em %3, %4 usando Qt %5, %6</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="355"/> + <source>%1 %2</source> + <translation>%1 %2</translation> </message> </context> <context> @@ -4526,52 +4565,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Estado indefinido</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>A aguardar o início da sincronização.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>A sincronização está a decorrer</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Sincronização bem sucedida</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>Sincronizado bem sucedida, foram ignorados alguns ficheiros.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Erro de Sincronização</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Erro de Configuração</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>A preparar para sincronizar</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>A abortar...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>A sincronização está pausada</translation> </message> @@ -4579,53 +4618,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>utility</name> <message> - <location filename="../src/gui/guiutility.cpp" line="38"/> + <location filename="../src/gui/guiutility.cpp" line="39"/> <source>Could not open browser</source> <translation>Não foi possível abrir o browser</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="39"/> + <location filename="../src/gui/guiutility.cpp" line="40"/> <source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="62"/> + <location filename="../src/gui/guiutility.cpp" line="63"/> <source>Could not open email client</source> <translation>Não foi possivel abrir o cliente de email</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="63"/> + <location filename="../src/gui/guiutility.cpp" line="64"/> <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source> <translation>Ocorreu um erro ao lançar o cliente de email para criar uma nova mensagem. Talvez nenhum cliente de email esteja configurado?</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="78"/> + <location filename="../src/gui/guiutility.cpp" line="79"/> <source>Always available locally</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="82"/> + <location filename="../src/gui/guiutility.cpp" line="83"/> <source>Some available online only</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="84"/> - <location filename="../src/gui/guiutility.cpp" line="86"/> + <location filename="../src/gui/guiutility.cpp" line="85"/> + <location filename="../src/gui/guiutility.cpp" line="87"/> <source>Available online only</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="80"/> + <location filename="../src/gui/guiutility.cpp" line="81"/> <source>Currently available locally</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="93"/> + <location filename="../src/gui/guiutility.cpp" line="94"/> <source>Make always available locally</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="98"/> + <location filename="../src/gui/guiutility.cpp" line="99"/> <source>Free up local space</source> <translation type="unfinished"/> </message> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index e80941f93..d84887995 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -146,7 +146,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="131"/> + <location filename="../src/libsync/account.cpp" line="121"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -517,12 +517,12 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 em %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 em %2 (disconectado)</translation> </message> @@ -2076,7 +2076,7 @@ foi baixado. A versão instalada é %3.</p></translation> <translation><h1>Erro de conexão</h1><p>Falhou ao recuperar informações do usuário</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="295"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation> Erro: Campo ausente %1 @@ -2088,14 +2088,14 @@ foi baixado. A versão instalada é %3.</p></translation> <translation><h1>Erro de Login</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="206"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation>Erro ao atualizar o token: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="218"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2104,7 +2104,7 @@ Received data: %2</source> Dados recebidos: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="239"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>Usuário errado</h1><p>Você fez logon com o usuário <em>%1</em>, mas deve fazer login com o usuário <em>%2</em>.<br>Faça o logout de %3 em outra guia, então<a href='%4'>clique aqui</a> e faça o login como usuário%2</p></translation> </message> @@ -2193,7 +2193,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> <source>Use &virtual files instead of downloading content immediately%1</source> - <translation type="unfinished"/> + <translation>Use arquivo &virtual no lugar de baixar conteúdo imediatamente%1</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> @@ -2358,17 +2358,17 @@ It is not advisable to use it.</source> <translation>Tentando conectar a %1 em %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>A solicitação de autenticação ao servidor foi direcionada para '%1'. A URL está errada, a configuração do servidor está errada.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>Houve uma resposta inválida a um pedido de autenticação WebDAV</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="370"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Acesso proibido pelo servidor. Para verificar se você tem acesso adequado, <a href="%1">clique aqui</a> para acessar o serviço com o seu navegador.</translation> </message> @@ -2378,104 +2378,104 @@ It is not advisable to use it.</source> <translation>URL inválida</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Pasta local de sincronização %1 já existe, configurando para sincronização. <br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="427"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>Criação de pasta de sincronização local %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="433"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>falhou.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="435"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>Não foi possível criar pasta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>Nenhuma pasta remota foi especificada!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="480"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>criar pasta no ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>Pasta remota %1 criada com sucesso.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Pasta remota %1 já existe. Conectando para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="502"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>A criação da pasta resultou em um erro do código HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="504"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>A criação da pasta remota falhou porque as credenciais fornecidas estão erradas!<br/>Por favor, volte e verifique suas credenciais.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">A criação remota de pasta falhou provavelmente as causas da falha na criação da pasta remota são credenciais erradas</font><br/>Volte e verifique suas credenciais, por favor.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Falha na criação da pasta remota %1 com erro <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Uma conexão de sincronização de %1 para o diretório remoto %2 foi realizada.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>Conectado com sucesso a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Conexão à %1 não foi estabelecida. Por favor, verifique novamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Falha no nome da pasta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Não é possível remover e fazer backup da pasta porque a pasta ou um arquivo que está nesta pasta está aberto em outro programa. Por favor, feche a pasta ou arquivo e clique tentar novamente ou cancelar a operação.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="610"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Pasta de sincronização local %1 criada com sucesso!</b></font></translation> </message> @@ -3889,7 +3889,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="357"/> + <location filename="../src/libsync/theme.cpp" line="382"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation><p>Versão %1. Para mais informações, visite <a href="%2">https://%3</a></p><p>Para obter ajuda e problemas conhecidos, visite: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, e outros.</small></p><p>Copyright ownCloud GmbH</p><p>Distribuído por %4 e licenciado sob a GNU General Public License (GPL) Versão 2.0.<br/>%5 e a %5 logomarca são marcas registradas de %4 nos Estados Unidos, outros países, ou ambos.</p><p><small>%6</small></p></translation> </message> @@ -4349,37 +4349,37 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>no futuro</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>%n dia(s) atrás</numerusform><numerusform>%n dia(s) atrás</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>%n hora(s) atrás</numerusform><numerusform>%n hora(s) atrás</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>agora</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>A menos de um minuto atrás</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>%n minuto(s) atrás</numerusform><numerusform>%n minuto(s) atrás</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>Algum tempo atrás</translation> </message> @@ -4464,7 +4464,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="332"/> + <location filename="../src/libsync/theme.cpp" line="360"/> <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> <translation>%1 %2 %3 %4%8%9Bibliotecas Qt %5, %6%8Usando o plugin de arquivos virtuais: %7</translation> </message> @@ -4472,7 +4472,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="322"/> + <location filename="../src/libsync/theme.cpp" line="350"/> <source>%1 (Built against Qt %1)</source> <translation>%1 (Compilado com o Qt %1)</translation> </message> @@ -4480,7 +4480,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="327"/> + <location filename="../src/libsync/theme.cpp" line="355"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4588,52 +4588,52 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Status indefinido</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>Aguardando para iniciar sincronização</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>Sincronização em andamento</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Sucesso na Sincronização</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>Sincronizado com Sucesso, alguns arquivos foram ignorados.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Erro de sincronização</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Erro na Configuração</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>Preparando para sincronização</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>Abortando...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>Sincronização em pausa</translation> </message> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index cdb0464c0..00faf1357 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -146,7 +146,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="131"/> + <location filename="../src/libsync/account.cpp" line="121"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -517,12 +517,12 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 на %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 на %2 (отсоединён)</translation> </message> @@ -2076,7 +2076,7 @@ Note that using any logging command line options will override the settings.</so <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="295"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation> Ошибка: Не хватает поля %1 @@ -2088,14 +2088,14 @@ Note that using any logging command line options will override the settings.</so <translation><h1>Ошибка входа</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="206"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation>Ошибка при обновлении токена: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="218"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2104,7 +2104,7 @@ Received data: %2</source> Полученные данные: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="239"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>Неверный пользователь</h1><p>Вы вошли, как пользователь <em>%1</em>, но нужно войти под пользователем <em>%2</em>.<br>Пожалуйста, выйдите из %3 в другой вкладке, а затем <a href='%4'>кликните здесь</a> и войдите, как пользователь %2</p></translation> </message> @@ -2360,17 +2360,17 @@ It is not advisable to use it.</source> <translation>Попытка соединиться с %1 на %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>Запрос авторизации с сервера перенаправлен на '%1'. Ссылка не верна, сервер не настроен.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>Обнаружен не верный ответ на авторизованный запрос WebDAV</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="370"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Доступ запрещён сервером. Чтобы доказать, что у Вас есть права доступа, <a href="%1">нажмите здесь</a> для входа через Ваш браузер.</translation> </message> @@ -2380,104 +2380,104 @@ It is not advisable to use it.</source> <translation>Неверная ссылка</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Локальный каталог синхронизации %1 уже существует, используем его для синхронизации.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="427"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>Создание локальной папки синхронизации %1... </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>ок</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="433"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>не удалось.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="435"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>Не удалось создать локальный каталог синхронизации %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>Не указан удалённый каталог!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Ошибка: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="480"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>создание каталога на ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>Удалённый каталог %1 успешно создан.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Удалённый каталог %1 уже существует. Подключение к нему для синхронизации.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="502"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Создание каталога завершилось с HTTP-ошибкой %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="504"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Не удалось создать удаленный каталог, так как представленные параметры доступа неверны!<br/>Пожалуйста, вернитесь назад и проверьте учетные данные.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Не удалось создать удаленный каталог, возможно, указанные учетные данные неверны.</font><br/>Вернитесь назад и проверьте учетные данные.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Удаленный каталог %1 не создан из-за ошибки <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Установлено соединение синхронизации %1 к удалённому каталогу %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>Соединение с %1 установлено успешно!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Не удалось соединиться с %1. Попробуйте снова.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Ошибка переименования каталога</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Невозможно удалить каталог и создать его резервную копию, каталог или файл в ней открыт в другой программе. Закройте каталог или файл и нажмите "Повторить попытку", либо прервите мастер настройки.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="610"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Локальный каталог синхронизации %1 успешно создан!</b></font></translation> </message> @@ -3891,7 +3891,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="357"/> + <location filename="../src/libsync/theme.cpp" line="382"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4351,37 +4351,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>в будущем</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>%n день назад</numerusform><numerusform>%n дня назад</numerusform><numerusform>%n дней назад</numerusform><numerusform>%n дней назад</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>%n час назад</numerusform><numerusform>%n часа назад</numerusform><numerusform>%n часов назад</numerusform><numerusform>%n часов назад</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>сейчас</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>Меньше минуты назад</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>%n минута назад</numerusform><numerusform>%n минуты назад</numerusform><numerusform>%n минут назад</numerusform><numerusform>%n минут назад</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>Некоторое время назад</translation> </message> @@ -4466,7 +4466,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="332"/> + <location filename="../src/libsync/theme.cpp" line="360"/> <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> <translation type="unfinished"/> </message> @@ -4474,7 +4474,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="322"/> + <location filename="../src/libsync/theme.cpp" line="350"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4482,7 +4482,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="327"/> + <location filename="../src/libsync/theme.cpp" line="355"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4590,52 +4590,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Статус не определён</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>Ожидание начала синхронизации</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>Синхронизация запущена</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Синхронизация прошла успешно</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>Синхронизация прошла успешно, некоторые файлы были проигнорированы.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Ошибка синхронизации</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Ошибка установки</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>Подготовка к синхронизации</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>Прерывание...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>Синхронизация приостановлена</translation> </message> diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 39c20fb37..dbfc9530e 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -146,7 +146,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="131"/> + <location filename="../src/libsync/account.cpp" line="121"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -513,12 +513,12 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 na %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 na %2 (brez povezave)</translation> </message> @@ -2062,7 +2062,7 @@ Note that using any logging command line options will override the settings.</so <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="295"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation type="unfinished"/> @@ -2073,21 +2073,21 @@ Note that using any logging command line options will override the settings.</so <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="206"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="218"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="239"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation type="unfinished"/> </message> @@ -2343,17 +2343,17 @@ Uporaba ni priporočljiva.</translation> <translation>Poteka poskus povezave z %1 na %2 ...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>Zahteva za overitev s strežnikom je bila preusmerjena na '%1'. Naslov URL ni veljaven ali pa strežnik ni ustrezno nastavljen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>Prejet je neveljaven odziv na zahtevo overitve webdav</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="370"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Strežnik ne dovoli dostopa. Če želite preveriti, ali imate ustrezen dostop, <a href="%1">kliknite tu</a> za dostop do te storitve z brskalnikom.</translation> </message> @@ -2363,104 +2363,104 @@ Uporaba ni priporočljiva.</translation> <translation>Neveljaven naslov URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Krajevna mapa %1 že obstaja. Nastavljena bo za usklajevanje.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="427"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>Ustvarjanje mape za krajevno usklajevanje %1 ... </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>je v redu</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="433"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>je spodletelo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="435"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>Krajevne mape %1 ni mogoče ustvariti.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>Ni navedenega oddaljenega strežnika!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Napaka: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="480"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>ustvarjanje mape v oblaku ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>Oddaljena mapa %1 je uspešno ustvarjena.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Oddaljena mapa %1 že obstaja. Vzpostavljena bo povezava za usklajevanje.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="502"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Ustvarjanje mape je povzročilo napako HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="504"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Ustvarjanje mape na oddaljenem naslovu je spodletelo zaradi napačnih poveril. <br/>Vrnite se in preverite zahtevana gesla.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Ustvarjanje oddaljene mape je spodletelo. Najverjetneje je vzrok v neustreznih poverilih.</font><br/>Vrnite se na predhodno stran in jih preverite.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Ustvarjanje oddaljene mape %1 je spodletelo z napako <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Povezava za usklajevanje med %1 in oddaljeno mapo %2 je vzpostavljena.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>Povezava z %1 je uspešno vzpostavljena!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Povezave z %1 ni mogoče vzpostaviti. Preveriti je treba nastavitve.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Preimenovanje mape je spodletelo</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Mape ni mogoče odstraniti niti ni mogoče ustvariti varnostne kopije, saj je mapa oziroma dokument v njej odprt z drugim programom. Zaprite mapo/dokument ali prekinite namestitev.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="610"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Krajevno usklajena mapa %1 je uspešno ustvarjena!</b></font></translation> </message> @@ -3866,7 +3866,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="357"/> + <location filename="../src/libsync/theme.cpp" line="382"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4326,37 +4326,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>v prihodnje</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>pred %n dnevom</numerusform><numerusform>pred %n dnevoma</numerusform><numerusform>pred %n dnevi</numerusform><numerusform>pred %n dnevi</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>pred %n uro</numerusform><numerusform>pred %n urama</numerusform><numerusform>pred %n urami</numerusform><numerusform>pred %n urami</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>zdaj</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>Pred manj kot minuto</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>pred %n minuto</numerusform><numerusform>pred %n minutama</numerusform><numerusform>pred %n minutami</numerusform><numerusform>pred %n minutami</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>Pred nekaj časa</translation> </message> @@ -4441,7 +4441,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="332"/> + <location filename="../src/libsync/theme.cpp" line="360"/> <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> <translation type="unfinished"/> </message> @@ -4449,7 +4449,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="322"/> + <location filename="../src/libsync/theme.cpp" line="350"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4457,7 +4457,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="327"/> + <location filename="../src/libsync/theme.cpp" line="355"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4565,52 +4565,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Stanje je nedoločeno</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>Čakanje začetek usklajevanja</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>Usklajevanje v teku</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Usklajevanje je uspešno končano</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>Usklajevanje je končano, ostajajo pa nerešene težave s posameznimi datotekami.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Napaka usklajevanja</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Napaka nastavitve</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>Priprava na usklajevanje</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>Poteka prekinjanje ...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>Usklajevanje je ustavljeno</translation> </message> diff --git a/translations/client_sv.ts b/translations/client_sv.ts index cf0f7e10d..73d8f5c24 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -146,7 +146,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="131"/> + <location filename="../src/libsync/account.cpp" line="121"/> <source>%1@%2</source> <translation type="unfinished"/> </message> @@ -513,12 +513,12 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 på %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 på %2 (frånkopplad)</translation> </message> @@ -2057,7 +2057,7 @@ Note that using any logging command line options will override the settings.</so <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="295"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation type="unfinished"/> @@ -2068,21 +2068,21 @@ Note that using any logging command line options will override the settings.</so <translation><h1>Inloggningsfel</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="206"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="218"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="239"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation>Fel användare</h1><p> Du har loggat in med fel användare <em>%1</em>, men måste logga in med <em>%2</em>.<br>Vänligen logga ut från %3 i en annan flik, sen <a href='%4'>klicka här </a> och logga in som användare %2</p></translation> </message> @@ -2338,17 +2338,17 @@ Det är inte lämpligt använda den.</translation> <translation>Försöker ansluta till %1 på %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>Den autentiserade begäran till servern omdirigerades till '%1'. Den URLen är ogiltig, server är felkonfigurerad.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>Det kom ett ogiltigt svar på en autentiserad webdav-begäran</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="370"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Åtkomst förbjuden av servern. För att bekräfta att du har korrekta rättigheter, <a href="%1">klicka här</a> för att ansluta till tjänsten med din webb-läsare.</translation> </message> @@ -2358,104 +2358,104 @@ Det är inte lämpligt använda den.</translation> <translation>Ogiltig URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Lokal synkmapp %1 finns redan, aktiverar den för synk.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="427"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>Skapar lokal synk-mapp %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="433"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>misslyckades.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="435"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>Kunde inte skapa lokal mapp %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>Ingen fjärrmapp specificerad! </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Fel: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="480"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>skapar mapp på ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>Fjärrmapp %1 har skapats.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Fjärrmappen %1 finns redan. Ansluter den för synkronisering.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="502"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Skapande av mapp resulterade i HTTP felkod %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="504"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Det gick inte att skapa mappen efter som du inte har tillräckliga rättigheter!<br/>Vänligen återvänd och kontrollera dina rättigheter.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Misslyckades skapa fjärrmappen, troligen p.g.a felaktiga inloggningsuppgifter.</font><br/>Kontrollera dina inloggningsuppgifter.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Misslyckades skapa fjärrmapp %1 med fel <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>En synkroniseringsanslutning från %1 till fjärrmappen %2 har skapats.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>Ansluten till %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Anslutningen till %1 kunde inte etableras. Var god kontrollera och försök igen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Omdöpning av mapp misslyckades</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Kan inte ta bort och göra en säkerhetskopia av mappen på grund av att mappen eller en fil i den används av ett annat program. Vänligen stäng mappen eller filen och försök igen eller avbryt installationen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="610"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Lokal synkmapp %1 skapad!</b></font></translation> </message> @@ -3861,7 +3861,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="357"/> + <location filename="../src/libsync/theme.cpp" line="382"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4321,37 +4321,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>i framtiden</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>%n dag sedan</numerusform><numerusform>%n dag(ar) sedan</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>%n timme sedan</numerusform><numerusform>%n timmar sedan</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>nu</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>Mindre än en minut sedan</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>%n minut sedan</numerusform><numerusform>%n minut(er) sedan</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>En stund sedan</translation> </message> @@ -4436,7 +4436,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="332"/> + <location filename="../src/libsync/theme.cpp" line="360"/> <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> <translation type="unfinished"/> </message> @@ -4444,7 +4444,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="322"/> + <location filename="../src/libsync/theme.cpp" line="350"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4452,7 +4452,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="327"/> + <location filename="../src/libsync/theme.cpp" line="355"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4560,52 +4560,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Odefinierad status</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>Väntar på att starta synkronisering</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>Synkronisering är aktiv</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Lyckad synkronisering</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>Synk lyckades, men vissa filer ignorerades.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Synkfel</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Inställningsfel</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>Förbereder synkronisering</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>Avbryter</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>Synk är pausad</translation> </message> diff --git a/translations/client_th.ts b/translations/client_th.ts index 7f4095370..67b137136 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -13,7 +13,7 @@ <translation>ย้ายข้อมูลจาก '%1' ไป '%1' ไม่ได้</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="445"/> + <location filename="../src/common/filesystembase.cpp" line="442"/> <source>Moving to the trash is not implemented on this platform</source> <translation>การย้ายไปที่ถังขยะยังใช้งานไม่ได้บนแพลตฟอร์มนี้</translation> </message> @@ -87,22 +87,45 @@ <translation>แบบฟอร์ม</translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="58"/> + <location filename="../src/gui/notificationwidget.ui" line="73"/> <source>Lorem ipsum dolor sit amet</source> <translation>Lorem ipsum dolor sit amet</translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="71"/> + <location filename="../src/gui/notificationwidget.ui" line="86"/> <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source> <translation>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm</translation> </message> <message> - <location filename="../src/gui/notificationwidget.ui" line="91"/> + <location filename="../src/gui/notificationwidget.ui" line="106"/> <source>TextLabel</source> <translation>ป้ายข้อความ</translation> </message> </context> <context> + <name>OCC::AboutDialog</name> + <message> + <location filename="../src/gui/aboutdialog.ui" line="24"/> + <source>About</source> + <translation>เกี่ยวกับเรา</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.ui" line="88"/> + <source>TextLabel</source> + <translation>ป้ายข้อความ</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.ui" line="96"/> + <source>Versions</source> + <translation>เวอร์ชัน</translation> + </message> + <message> + <location filename="../src/gui/aboutdialog.cpp" line="28"/> + <source>About %1</source> + <translation>เกี่ยวกับ %1</translation> + </message> +</context> +<context> <name>OCC::AbstractNetworkJob</name> <message> <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> @@ -121,6 +144,14 @@ </message> </context> <context> + <name>OCC::Account</name> + <message> + <location filename="../src/libsync/account.cpp" line="121"/> + <source>%1@%2</source> + <translation>%1@%2</translation> + </message> +</context> +<context> <name>OCC::AccountSettings</name> <message> <location filename="../src/gui/accountsettings.ui" line="14"/> @@ -130,7 +161,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser </source> - <translation type="unfinished"/> + <translation>เปิดเบราว์เซอร์ใหม่อีกครั้ง</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -163,15 +194,15 @@ <translation>ใช้การเปลี่ยนแปลงด้วยตนเอง</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="267"/> + <location filename="../src/gui/accountsettings.ui" line="282"/> <source>Apply</source> <translation>นำไปใช้</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="254"/> - <location filename="../src/gui/accountsettings.cpp" line="512"/> - <location filename="../src/gui/accountsettings.cpp" line="624"/> - <location filename="../src/gui/accountsettings.cpp" line="1083"/> + <location filename="../src/gui/accountsettings.ui" line="269"/> + <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="611"/> + <location filename="../src/gui/accountsettings.cpp" line="1048"/> <source>Cancel</source> <translation>ยกเลิก</translation> </message> @@ -181,87 +212,67 @@ <translation>เชื่อมต่อกับ <server> ด้วยผู้ใช้ <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="182"/> + <location filename="../src/gui/accountsettings.cpp" line="180"/> <source>No account configured.</source> <translation>ไม่มีการกำหนดค่าบัญชี</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="200"/> - <source>Add new</source> - <translation>เพิ่มใหม่</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="209"/> + <location filename="../src/gui/accountsettings.cpp" line="203"/> <source>Remove</source> <translation>ลบออก</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="213"/> + <location filename="../src/gui/accountsettings.cpp" line="207"/> <source>Account</source> <translation>บัญชี</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="310"/> + <location filename="../src/gui/accountsettings.cpp" line="297"/> <source>Choose what to sync</source> <translation>เลือกข้อมูลที่ต้องการประสาน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="316"/> + <location filename="../src/gui/accountsettings.cpp" line="303"/> <source>Force sync now</source> <translation>บังคับประสานข้อมูลเดี๋ยวนี้</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="305"/> <source>Restart sync</source> <translation>ประสานข้อมูลอีกครั้ง</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="327"/> + <location filename="../src/gui/accountsettings.cpp" line="314"/> <source>Remove folder sync connection</source> <translation>ลบโฟลเดอร์ที่ประสานข้อมูลออก</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>Enable virtual file support %1...</source> - <translation>เปิดใช้งานการรองรับไฟล์เสมือน %1...</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>(tech preview)</source> - <translation>(ตัวอย่างทางเทคนิค)</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="356"/> - <source>(experimental)</source> - <translation>(ทดลอง)</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.cpp" line="445"/> + <location filename="../src/gui/accountsettings.cpp" line="433"/> <source>Folder creation failed</source> <translation>สร้างโฟลเดอร์ล้มเหลว</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="446"/> + <location filename="../src/gui/accountsettings.cpp" line="434"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>ไม่สามารถสร้างโฟลเดอร์ในเครื่อง <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="504"/> + <location filename="../src/gui/accountsettings.cpp" line="491"/> <source>Confirm Folder Sync Connection Removal</source> <translation>ยืนยันการลบโฟลเดอร์ที่ประสานข้อมูลออก</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="511"/> + <location filename="../src/gui/accountsettings.cpp" line="499"/> <source>Remove Folder Sync Connection</source> <translation>ลบโฟลเดอร์ที่ประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="615"/> + <location filename="../src/gui/accountsettings.cpp" line="602"/> <source>Disable virtual file support?</source> <translation>ปิดใช้งานการสนับสนุนไฟล์เสมือน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="616"/> + <location filename="../src/gui/accountsettings.cpp" line="603"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -274,173 +285,183 @@ This action will abort any currently running synchronization.</source> การดำเนินการนี้จะยกเลิกการประสานข้อมูลที่กำลังทำงานอยู่</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="623"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Disable support</source> <translation>ปิดใช้งานการสนับสนุน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="733"/> + <location filename="../src/gui/accountsettings.cpp" line="712"/> <source>Sync Running</source> <translation>กำลังประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="734"/> + <location filename="../src/gui/accountsettings.cpp" line="713"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>กำลังดำเนินการประสานข้อมูลอยู่ <br/>คุณต้องการสิ้นสุดการทำงาน?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="829"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>%1 in use</source> <translation>%1 กำลังถูกใช้งาน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="856"/> + <location filename="../src/gui/accountsettings.cpp" line="836"/> <source>%1 as <i>%2</i></source> <translation>%1 เช่น <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="845"/> <source>Connected to %1.</source> <translation>เชื่อมต่อกับ %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="870"/> + <location filename="../src/gui/accountsettings.cpp" line="850"/> <source>Server %1 is temporarily unavailable.</source> <translation>เซิร์ฟเวอร์ %1 ไม่สามารถใช้ได้ชั่วคราว</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is currently in maintenance mode.</source> <translation>เซิร์ฟเวอร์ %1 กำลังอยู่ในโหมดการบำรุงรักษา</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="876"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Signed out from %1.</source> <translation>ลงชื่อออกจาก %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="886"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Connecting to %1...</source> <translation>กำลังเชื่อมต่อไปยัง %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="871"/> <source>No connection to %1 at %2.</source> <translation>ไม่มีการเชื่อมต่อไปยัง %1 ที่ %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="930"/> + <location filename="../src/gui/accountsettings.cpp" line="910"/> <source>Log in</source> <translation>เข้าสู่ระบบ</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1026"/> + <location filename="../src/gui/accountsettings.cpp" line="1005"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>บางโฟลเดอร์จะไม่ถูกประสานข้อมูลเพราะขนาดของมันใหญ่เกินไป:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1028"/> + <location filename="../src/gui/accountsettings.cpp" line="1007"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>มีบางโฟลเดอร์จะไม่ถูกประสานข้อมูลเพราะเป็นพื้นที่จัดเก็บข้อมูลภายนอก</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1029"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>มีบางโฟลเดอร์จะไม่ถูกประสานข้อมูลเพราะเป็นพื้นที่จัดเก็บข้อมูลภายนอกหรือมีขนาดที่ใหญ่เกินไป</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1075"/> + <location filename="../src/gui/accountsettings.cpp" line="1041"/> <source>Confirm Account Removal</source> <translation>ยืนยันการลบบัญชี</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1076"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>คุณต้องการลบการเชื่อมต่อกับบัญชี<i>%1</i>?</p><p><b>หมายเหตุ:</b> นี้จะ <b>ไม่</b> ลบไฟล์ใดๆ</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1082"/> + <location filename="../src/gui/accountsettings.cpp" line="1047"/> <source>Remove connection</source> <translation>ลบการเชื่อมต่อ</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="306"/> + <location filename="../src/gui/accountsettings.cpp" line="293"/> <source>Open folder</source> <translation>เปิดโฟลเดอร์</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="205"/> - <location filename="../src/gui/accountsettings.cpp" line="932"/> + <location filename="../src/gui/accountsettings.cpp" line="199"/> + <location filename="../src/gui/accountsettings.cpp" line="912"/> <source>Log out</source> <translation>ออกจากระบบ</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="265"/> + <location filename="../src/gui/accountsettings.cpp" line="252"/> <source>Open local folder</source> <translation>เปิดโฟลเดอร์ในเครื่อง</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="273"/> + <location filename="../src/gui/accountsettings.cpp" line="260"/> <source>Open folder in browser</source> <translation>เปิดโฟลเดอร์ในเบราว์เซอร์</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="324"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Resume sync</source> <translation>ประสานข้อมูลอีกครั้ง</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="324"/> + <location filename="../src/gui/accountsettings.cpp" line="311"/> <source>Pause sync</source> <translation>หยุดประสานข้อมูลชั่วคราว</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="331"/> + <location filename="../src/gui/accountsettings.cpp" line="318"/> <source>Availability</source> <translation>ความพร้อมใช้งาน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="348"/> + <location filename="../src/gui/accountsettings.cpp" line="335"/> <source>Disable virtual file support...</source> <translation>ปิดใช้งานการสนับสนุนไฟล์เสมือน...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="505"/> + <location filename="../src/gui/accountsettings.cpp" line="343"/> + <source>Enable virtual file support%1...</source> + <translation>เปิดใช้งานการสนับสนุนไฟล์เสมือน %1...</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="343"/> + <source> (experimental)</source> + <translation>(โหมดเบต้า)</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="492"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>คุณต้องการหยุดการประสานข้อมูลโฟลเดอร์<i>%1</i>?</p><p><b>หมายเหตุ:</b> นี้จะ <b>ไม่</b> ลบไฟล์ใดๆ</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="816"/> + <location filename="../src/gui/accountsettings.cpp" line="796"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>มีการใช้งาน %1 (%3%) จาก %2 บางโฟลเดอร์รวมทั้งเครือข่ายที่ติดตั้งหรือโฟลเดอร์ที่แชร์อาจมีข้อจำกัดที่แตกต่างกัน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="817"/> + <location filename="../src/gui/accountsettings.cpp" line="797"/> <source>%1 of %2 in use</source> <translation>มีการใช้งาน %1 จาก %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="826"/> + <location filename="../src/gui/accountsettings.cpp" line="806"/> <source>Currently there is no storage usage information available.</source> <translation>ขณะนี้ไม่มีพื้นที่จัดเก็บข้อมูลที่ใช้งานได้</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="863"/> + <location filename="../src/gui/accountsettings.cpp" line="843"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>เซิร์ฟไม่สนับสนุนเวอร์เวอร์ชัน %1 นี่เป็นความเสี่ยงของคุณเอง</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="883"/> + <location filename="../src/gui/accountsettings.cpp" line="863"/> <source>Obtaining authorization from the browser.</source> - <translation type="unfinished"/> + <translation>กำลังขออนุมัติจากเบราว์เซอร์</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="896"/> + <location filename="../src/gui/accountsettings.cpp" line="876"/> <source>Server configuration error: %1 at %2.</source> - <translation type="unfinished"/> + <translation>ข้อผิดพลาดการกำหนดค่าเซิร์ฟเวอร์: %1 ที่ %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="907"/> + <location filename="../src/gui/accountsettings.cpp" line="887"/> <source>No %1 connection configured.</source> <translation>ไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation> </message> @@ -496,12 +517,12 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 บน %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 บน %2 (ตัดการเชื่อมต่อ)</translation> </message> @@ -517,46 +538,46 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="515"/> - <location filename="../src/gui/activitywidget.cpp" line="563"/> + <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="570"/> <source>Server Activity</source> <translation>กิจกรรมของเซิร์ฟเวอร์</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>โปรโตคอลที่ใช้ในการผสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>ไม่ถูกประสานข้อมูลให้ตรงกัน</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="574"/> + <location filename="../src/gui/activitywidget.cpp" line="581"/> <source>Not Synced (%1)</source> <extracomment>%1 is the number of not synced files.</extracomment> <translation>ไม่ถูกประสานข้อมูล (%1)</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="606"/> + <location filename="../src/gui/activitywidget.cpp" line="613"/> <source>The server activity list has been copied to the clipboard.</source> <translation>รายการกิจกรรมเซิร์ฟเวอร์ได้ถูกคัดลอกไปยังคลิปบอร์ด</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="610"/> + <location filename="../src/gui/activitywidget.cpp" line="617"/> <source>The sync activity list has been copied to the clipboard.</source> <translation>รายการกิจกรรมการประสานข้อมูลได้ถูกคัดลอกไปยังคลิปบอร์ด</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="613"/> + <location filename="../src/gui/activitywidget.cpp" line="620"/> <source>The list of unsynced items has been copied to the clipboard.</source> <translation>รายชื่อของรายการที่ไม่ได้ประสานข้อมูล ได้ถูกคัดลอกไปยังคลิปบอร์ด</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="618"/> + <location filename="../src/gui/activitywidget.cpp" line="625"/> <source>Copied to clipboard</source> - <translation>คัดลอกไปยังคลิปบอร์ด</translation> + <translation>คัดลอกลิงก์ไปยังคลิปบอร์ด</translation> </message> </context> <context> @@ -574,47 +595,47 @@ This action will abort any currently running synchronization.</source> <translation>ป้ายข้อความ</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>กิจกรรมของเซิร์ฟเวอร์</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>คัดลอก</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="93"/> + <location filename="../src/gui/activitywidget.cpp" line="100"/> <source>Copy the activity list to the clipboard.</source> <translation>คัดลอกรายชื่อกิจกรรมไปยังคลิปบอร์ด</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>การแจ้งเตือน</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="351"/> + <location filename="../src/gui/activitywidget.cpp" line="358"/> <source>%n notifications(s) for %1.</source> <translation><numerusform>มี %n การแจ้งเตือนสำหรับ %1</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="357"/> + <location filename="../src/gui/activitywidget.cpp" line="364"/> <source>%n notifications(s) for %1 and %2.</source> <translation><numerusform>มี %n การแจ้งเตือนสำหรับ %1 และ %2</numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="359"/> + <location filename="../src/gui/activitywidget.cpp" line="366"/> <source>New notifications for %1, %2 and other accounts.</source> <translation>มีการแจ้งเตือนใหม่สำหรับ %1, %2 และบัญชีอื่นๆ</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="362"/> + <location filename="../src/gui/activitywidget.cpp" line="369"/> <source>Open the activity view for details.</source> <translation>เปิดมุมมองกิจกรรมเพื่อดูรายละเอียด</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="145"/> + <location filename="../src/gui/activitywidget.cpp" line="152"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br />บัญชี %1 ไม่มีกิจกรรมที่เปิดใช้งาน</translation> </message> @@ -665,42 +686,42 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="134"/> + <location filename="../src/gui/application.cpp" line="136"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>กำลังทำต่อหมายถึง <b>กำลังลบการตั้งค่าเหล่านี้</b></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="138"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>กำลังทำต่อหมายถึง <b>กำลังละเว้นการตั้งค่าเหล่านี้</b></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="142"/> + <location filename="../src/gui/application.cpp" line="144"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>การตั้งค่าบางอย่างได้ถูกกำหนดค่าในเวอร์ชันที่ใหม่กว่าของไคลเอ็นต์นี้และเปิดใช้คุณลักษณะที่ไม่สามารถใช้ได้ในเวอร์ชันนี้ <br><br>%1<br><br>ไฟล์การตั้งค่าปัจจุบันได้ถูกสำรองข้อมูลไปที่ <i>%2</i> แล้ว</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="149"/> + <location filename="../src/gui/application.cpp" line="151"/> <source>Quit</source> <translation>ออก</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="150"/> + <location filename="../src/gui/application.cpp" line="152"/> <source>Continue</source> <translation>ดำเนินการต่อ</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="299"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Error accessing the configuration file</source> <translation>เกิดข้อผิดพลาดขณะกำลังเข้าถึงไฟล์กำหนดค่า</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="300"/> + <location filename="../src/gui/application.cpp" line="310"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>เกิดข้อผิดพลาดขณะกำลังเข้าถึงไฟล์กำหนดค่า %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="303"/> + <location filename="../src/gui/application.cpp" line="313"/> <source>Quit ownCloud</source> <translation>ออกจาก ownCloud</translation> </message> @@ -731,7 +752,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1135"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1140"/> <source>Error writing metadata to the database</source> <translation>ข้อผิดพลาดในการเขียน metadata ไปยังฐานข้อมูล</translation> </message> @@ -773,7 +794,7 @@ This action will abort any currently running synchronization.</source> <name>OCC::DiscoverySingleDirectoryJob</name> <message> <location filename="../src/libsync/discoveryphase.cpp" line="480"/> - <location filename="../src/libsync/discoveryphase.cpp" line="502"/> + <location filename="../src/libsync/discoveryphase.cpp" line="501"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>ข้อผิดพลาดเซิร์ฟเวอร์: การตอบกลับ PROPFIND ไม่ใช่รูปแบบ XML!</translation> </message> @@ -809,135 +830,135 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="172"/> + <location filename="../src/gui/folder.cpp" line="173"/> <source>Local folder %1 does not exist.</source> <translation>โฟลเดอร์ %1 ไม่มีอยู่ในเครื่อง</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="175"/> + <location filename="../src/gui/folder.cpp" line="176"/> <source>%1 should be a folder but is not.</source> <translation>%1 ควรจะเป็นโฟลเดอร์ แต่ทำไม่ได้</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="178"/> + <location filename="../src/gui/folder.cpp" line="179"/> <source>%1 is not readable.</source> <translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 ได้ถูกลบออก</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 ได้ถูกอัปเดตเรียบร้อยแล้ว</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 ได้ถูกเปลี่ยนชื่อเป็น %2</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2.</source> <translation>%1 ได้ถูกย้ายไปยัง %2</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="414"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 และ %n ไฟล์อื่นๆได้ถูกลบออก</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="420"/> + <location filename="../src/gui/folder.cpp" line="421"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 และ %n </numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 ได้ถูกเพิ่มแล้ว</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="427"/> + <location filename="../src/gui/folder.cpp" line="428"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 และ %n ไฟล์อื่นๆ ได้รับการอัปเดต</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="434"/> + <location filename="../src/gui/folder.cpp" line="435"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 และไฟล์อื่นๆอีก %n ไฟล์ได้ถูกเปลี่ยนชื่อเป็น %2</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="441"/> + <location filename="../src/gui/folder.cpp" line="442"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 และไฟล์อื่นๆอีก %n ไฟล์ได้ถูกย้ายไปยัง %2</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="448"/> + <location filename="../src/gui/folder.cpp" line="449"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 และ %n ไฟล์อื่นๆ เกิดปัญหาขณะประสานข้อมูล</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 มีปัญหาขณะประสานข้อมูล กรุณาตรวจสอบไฟล์ที่มีปัญหานั้น</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="455"/> + <location filename="../src/gui/folder.cpp" line="456"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 และไฟล์อื่นๆอีก %n ไฟล์ไม่สามารถประสานข้อมูลเนื่องจากเกิดข้อผิดพลาด กรุณาดูไฟล์ log สำหรับรายละเอียดเพิ่มเติม</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 ไม่สามารถประสานข้อมูลเนื่องจากมีข้อผิดพลาด สามารถดูไฟล์ log สำหรับรายละเอียดเพิ่มเติม</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="463"/> + <location filename="../src/gui/folder.cpp" line="464"/> <source>Sync Activity</source> <translation>ความเคลื่อนไหวของการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="800"/> <source>Could not read system exclude file</source> <translation>ไม่สามารถอ่าน ยกเว้นไฟล์ระบบ</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1045"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>โฟลเดอร์ใหม่มีขนาดใหญ่กว่า %1 เมกะไบต์ ได้ถูกเพิ่ม: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>A folder from an external storage has been added. </source> <translation>โฟลเดอร์ที่มีพื้นที่จัดเก็บข้อมูลภายนอกได้ถูกเพิ่ม </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1049"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>กรุณาไปในส่วนของการตั้งค่าเพื่อเลือก ถ้าคุณต้องการจะดาวน์โหลด</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1109"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>โฟลเดอร์ %1 ได้ถูกสร้างขึ้นแล้วแต่ยังไม่ได้ประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1112"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>ไฟล์ %1 ได้ถูกสร้างขึ้นแล้วแต่ยังไม่ได้ประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <source>Changes in synchronized folders could not be tracked reliably. This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default). @@ -948,7 +969,7 @@ This means that the synchronization client might not upload local changes immedi หมายความว่าการประสานข้อมูลของไคลเอ็นต์อาจยังไม่ได้อัปโหลดการเปลี่ยนแปลงในระบบทันทีและจะสแกนเฉพาะการเปลี่ยนแปลงในเครื่องและอัปโหลดไฟล์เหล่านั้นเป็นครั้งคราว (ทุกสองชั่วโมงตามค่าเริ่มต้น)</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1208"/> + <location filename="../src/gui/folder.cpp" line="1197"/> <source>All files in the sync folder '%1' folder were deleted on the server. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to keep the files, they will be re-synced with the server if you have rights to do so. @@ -959,7 +980,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a หากคุณตัดสินใจลบไฟล์ก็จะทำให้ไม่มีใครสามารถใช้งานโฟลเดอร์นี้ได้เพราะคุณเป็นเจ้าของ</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1202"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -969,17 +990,17 @@ If this was an accident and you decide to keep your files, they will be re-synce ถ้าเรื่องนี้เป็นอุบัติเหตุและคุณตัดสินใจเก็บไฟล์ของคุณ ไฟล์ของคุณก็จะถูกประสานข้อมูลใหม่อีกครั้ง</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1217"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>ลบไฟล์ทั้งหมด?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>ลบไฟล์ทั้งหมด</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>เก็บไฟล์เอาไว้</translation> </message> @@ -987,107 +1008,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="357"/> <source>Could not reset folder state</source> <translation>ไม่สามารถรีเซ็ตสถานะโฟลเดอร์</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="356"/> + <location filename="../src/gui/folderman.cpp" line="358"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>บนบันทึกการประสานข้อมูลเก่า '%1' แต่ไม่สามารถลบออกได้ กรุณาตรวจสอบให้แน่ใจว่าไม่มีแอปฯ หรือการทำงานใดๆที่ใช้มันอยู่</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation>(สำรองข้อมูล)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation>(สำรองข้อมูล %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Undefined State.</source> <translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1332"/> <source>Waiting to start syncing.</source> <translation>กำลังรอเริ่มต้นการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>Preparing for sync.</source> <translation>กำลังเตรียมการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1336"/> + <location filename="../src/gui/folderman.cpp" line="1338"/> <source>Sync is running.</source> <translation>การประสานข้อมูลกำลังทำงาน</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync was successful, unresolved conflicts.</source> <translation>ประสานข้อมูลสำเร็จแต่ยังมีข้อขัดแย้งที่ยังไม่ได้รับการแก้ไข</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1343"/> + <location filename="../src/gui/folderman.cpp" line="1345"/> <source>Last Sync was successful.</source> <translation>ประสานข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>เกิดข้อผิดพลาดในการติดตั้ง</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>ยกเลิกผู้ใช้</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>Sync is paused.</source> <translation>การประสานข้อมูลถูกหยุดไว้ชั่วคราว</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1361"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>%1 (Sync is paused)</source> <translation>%1 (การประสานข้อมูลถูกหยุดชั่วคราว)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1369"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <source>No valid folder selected!</source> <translation>เลือกโฟลเดอร์ไม่ถูกต้อง!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path does not exist!</source> <translation>เส้นทางที่เลือกไม่มีอยู่!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1382"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>The selected path is not a folder!</source> <translation>เส้นทางที่เลือกไม่ใช่โฟลเดอร์!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1391"/> <source>You have no permission to write to the selected folder!</source> <translation>คุณมีสิทธิ์เขียนโฟลเดอร์ที่เลือกนี้!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1456"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>โฟลเดอร์นี้ได้ถูกประสานข้อมูลกับเซิร์ฟเวอร์แล้ว โปรดเลือกโฟลเดอร์อื่นๆ!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1436"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>เนื้อหาโฟลเดอร์ในเครื่อง %1 ได้ถูกใช้ไปแล้วในโฟลเดอร์ที่ประสานข้อมูล กรุณาเลือกอีกอันหนึ่ง!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1442"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>เนื้อหาของโฟลเดอร์ในเครื่อง %1 ไดถูกใช้ไปแล้วในโฟลเดอร์ที่ประสานข้อมูล กรุณาเลือกอีกอันหนึ่ง!</translation> </message> @@ -1095,16 +1116,11 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderStatusDelegate</name> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="47"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="46"/> <source>Add Folder Sync Connection</source> <translation>เพิ่มโฟลเดอร์ที่ต้องการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="248"/> - <source>Synchronizing with local folder</source> - <translation>กำลังประสานข้อมูลกับโฟลเดอร์ในเครื่อง</translation> - </message> - <message> <location filename="../src/gui/folderstatusdelegate.cpp" line="299"/> <source>File</source> <translation>ไฟล์</translation> @@ -1155,107 +1171,117 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>มีข้อขัดแย้งที่ยังไม่ได้รับการแก้ไข คลิกเพื่อดูรายละเอียด</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <source>Synchronizing VirtualFiles with local folder</source> + <translation>กำลังประสานข้อมูลไฟล์เสมือนกับโฟลเดอร์ในเครื่อง</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <source>Synchronizing with local folder</source> + <translation>กำลังประสานข้อมูลกับโฟลเดอร์ในเครื่อง</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in remote '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในรีโมต '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> <source>Checking for changes in local '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในเครื่อง '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> <source>Reconciling changes</source> <translation>คืนค่าการเปลี่ยนแปลง</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>กำลังประสานข้อมูล %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> <source>, </source> <translation>หรือ</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>ดาวน์โหลด %1/วินาที</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>↑ %1/s</source> <translation>↑ %1/วินาที</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>อัปโหลด %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 ของ %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>เหลืออีก %5 ไฟล์, %1 ไฟล์จาก %2, %3 ไฟล์จาก %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 จาก %2, %3 จาก %4 ไฟล์</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> <source>file %1 of %2</source> <translation>ไฟล์ %1 จาก %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> <source>Waiting...</source> <translation>กรุณารอซักครู่...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>กำลังรออีก (%n) โฟลเดอร์...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> <source>Preparing to sync...</source> <translation>กำลังเตรียมพร้อมในการประสานข้อมูล</translation> </message> @@ -1279,12 +1305,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="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Folder Sync Connection</source> <translation>เพิ่มโฟลเดอร์ที่ต้องการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="576"/> + <location filename="../src/gui/folderwizard.cpp" line="578"/> <source>Add Sync Connection</source> <translation>เพิ่มการประสานข้อมูลให้ตรงกัน</translation> </message> @@ -1292,17 +1318,17 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizardLocalPath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="68"/> + <location filename="../src/gui/folderwizard.cpp" line="69"/> <source>Click to select a local folder to sync.</source> <translation>คลิกเพื่อเลือกโฟลเดอร์ในเครื่องสำหรับประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="75"/> + <location filename="../src/gui/folderwizard.cpp" line="76"/> <source>Enter the path to the local folder.</source> <translation>ป้อนพาธไปยังโฟลเดอร์ในเครื่อง</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="136"/> + <location filename="../src/gui/folderwizard.cpp" line="137"/> <source>Select the source folder</source> <translation>เลือกโฟลเดอร์ต้นฉบับ</translation> </message> @@ -1310,52 +1336,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizardRemotePath</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="184"/> + <location filename="../src/gui/folderwizard.cpp" line="185"/> <source>Create Remote Folder</source> <translation>สร้างโฟลเดอร์รีโมท</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="185"/> + <location filename="../src/gui/folderwizard.cpp" line="186"/> <source>Enter the name of the new folder to be created below '%1':</source> - <translation>ใส่ชื่อของโฟลเดอร์ใหม่ที่จะถูกสร้างขึ้นดังต่อไปนี้ '%1':</translation> + <translation>กรอกชื่อของโฟลเดอร์ใหม่ที่จะถูกสร้างขึ้นดังต่อไปนี้ '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="215"/> + <location filename="../src/gui/folderwizard.cpp" line="216"/> <source>Folder was successfully created on %1.</source> <translation>โฟลเดอร์ถูกสร้างขึ้นเรียบร้อยแล้วเมื่อ %1...</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="226"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Authentication failed accessing %1</source> <translation>รับรองความถูกต้องล้มเหลวขณะกำลังเข้าถึง %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="228"/> + <location filename="../src/gui/folderwizard.cpp" line="229"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>ไม่สามารถสร้างโฟลเดอร์บน %1 กรุณาตรวจสอบด้วยตนเอง</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="247"/> <source>Failed to list a folder. Error: %1</source> <translation>รายการโฟลเดอร์ล้มเหลว ข้อผิดพลาด: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="328"/> <source>Choose this to sync the entire account</source> <translation>เลือกตัวเลือกนี้เพื่อประสานข้อมูลบัญชีทั้งหมด</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="440"/> <source>This folder is already being synced.</source> <translation>โฟลเดอร์นี้ถูกประสานข้อมูลอยู่แล้ว</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="442"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>คุณประสานข้อมูล <i>%1</i> อยู่แล้ว ซึ่งมีโฟลเดอร์หลักเป็น <i>%2</i></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="444"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>คุณได้ประสานข้อมูล <i>%1</i>ที่อยู่ภายในโฟลเดอร์ย่อยของ <i>%2</i> แล้ว</translation> </message> @@ -1363,30 +1389,30 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> - <source>Use virtual files instead of downloading content immediately %1</source> - <translation>ใช้ไฟล์เสมือนแทนการดาวน์โหลดเนื้อหาแบบทันที</translation> + <location filename="../src/gui/folderwizard.cpp" line="485"/> + <source>Use virtual files instead of downloading content immediately%1</source> + <translation>ใช้ไฟล์เสมือนแทนการดาวน์โหลดเนื้อหาทันที %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="489"/> - <source>(tech preview)</source> - <translation>(ตัวอย่างทางเทคนิค)</translation> + <location filename="../src/gui/folderwizard.cpp" line="485"/> + <source> (experimental)</source> + <translation>(โหมดเบต้า)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="489"/> - <source>(experimental)</source> - <translation>(ทดลอง)</translation> + <location filename="../src/gui/folderwizard.cpp" line="519"/> + <source>Virtual files are not available for the selected folder</source> + <translation>ไฟล์เสมือนไม่พร้อมใช้งานสำหรับโฟลเดอร์ที่เลือก</translation> </message> </context> <context> <name>OCC::FormatWarningsWizardPage</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="49"/> + <location filename="../src/gui/folderwizard.cpp" line="50"/> <source><b>Warning:</b> %1</source> <translation><b>คําเตือน:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="51"/> + <location filename="../src/gui/folderwizard.cpp" line="52"/> <source><b>Warning:</b></source> <translation><b>คําเตือน:</b></translation> </message> @@ -1396,22 +1422,22 @@ If this was an accident and you decide to keep your files, they will be re-synce <message> <location filename="../src/libsync/propagatedownload.cpp" line="180"/> <source>No E-Tag received from server, check Proxy/Gateway</source> - <translation type="unfinished"/> + <translation>ไม่มี E-Tag ที่ได้รับจากเซิร์ฟเวอร์ กรุณาตรวจสอบ พร็อกซี่หรือเกตเวย์</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="187"/> <source>We received a different E-Tag for resuming. Retrying next time.</source> - <translation type="unfinished"/> + <translation>เราได้รับ E-Tag ที่แตกต่างกันสำหรับการทำงาน กรุณาลองอีกครั้งในเวลาถัดไป</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="197"/> <source>We received an unexpected download Content-Length.</source> - <translation type="unfinished"/> + <translation>เราได้รับการดาวน์โหลดความยาวของเนื้อหาโดยไม่คาดคิด</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="224"/> <source>Server returned wrong content-range</source> - <translation type="unfinished"/> + <translation>เซิร์ฟเวอร์ส่งคืนช่วงของเนื้อหาที่ผิด</translation> </message> </context> <context> @@ -1435,48 +1461,73 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>การตั้งค่าทั่วไป</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="55"/> - <source>For System Tray</source> - <translation>สำหรับถาดของระบบ</translation> + <location filename="../src/gui/generalsettings.ui" line="80"/> + <source>Sync hidden files</source> + <translation>ประสานข้อมูลไฟล์ที่ถูกซ่อนอยู่</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="109"/> + <source>Log Settings</source> + <translation>การตั้งค่าบันทึก</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="136"/> + <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> + <translation>ขั้นสูง - การอนุมัติการซิงค์โฟลเดอร์ (โหมดอื่นๆสามารถใช้ได้)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="184"/> + <location filename="../src/gui/generalsettings.ui" line="196"/> <source>Network</source> - <translation type="unfinished"/> + <translation>เครือข่าย</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="208"/> + <source>Updates</source> + <translation>อัปเดต</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="257"/> + <location filename="../src/gui/generalsettings.ui" line="237"/> <source>stable</source> - <translation>รุ่นเสถียร</translation> + <translation>เวอร์ชันเสถียร</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="262"/> + <location filename="../src/gui/generalsettings.ui" line="242"/> <source>beta</source> - <translation>รุ่นเบต้า</translation> + <translation>เวอร์ชันเบต้า</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="68"/> + <location filename="../src/gui/generalsettings.ui" line="337"/> + <source>About</source> + <translation>เกี่ยวกับเรา</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="65"/> <source>Advanced</source> <translation>ขั้นสูง</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="100"/> + <location filename="../src/gui/generalsettings.ui" line="41"/> + <source>Use &Monochrome Icons in the system tray</source> + <translation>ใช้ไอคอนขาวดำในถาดระบบ</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="144"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>ถามก่อนที่จะประสานข้อมูลกับโฟลเดอร์ที่มีขนาดใหญ่กว่า</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="120"/> + <location filename="../src/gui/generalsettings.ui" line="164"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>เมกะไบต์</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="186"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>ถามก่อนที่จะประสานข้อมูลกับพื้นที่จัดเก็บข้อมูลภายนอก</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="41"/> + <location filename="../src/gui/generalsettings.ui" line="55"/> <source>&Launch on System Startup</source> <translation>และเปิดใช้งานเมื่อเริ่มต้นระบบ</translation> </message> @@ -1486,71 +1537,56 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>แสดงและแจ้งเตือนบนเดสก์ทอป</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="58"/> - <source>Use &Monochrome Icons</source> - <translation>ใช้ไอคอนขาวดำ</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="213"/> - <source>Version</source> - <translation>รุ่น</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="240"/> + <location filename="../src/gui/generalsettings.ui" line="220"/> <source>&Update Channel</source> <translation>และอัปเดตแชนแนล</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="346"/> - <source>•</source> - <translation>•</translation> - </message> - <message> - <location filename="../src/gui/generalsettings.ui" line="76"/> + <location filename="../src/gui/generalsettings.ui" line="102"/> <source>Edit &Ignored Files</source> <translation>แก้ไขและละเว้นการแก้ไขไฟล์</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="155"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>แสดงการประสานข้อมูลโฟลเดอร์ และหน้าต่างการนำทางของ Explorer</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="172"/> + <location filename="../src/gui/generalsettings.ui" line="93"/> <source>S&how crash reporter</source> <translation>แสดงรายงานความผิดพลาด</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="289"/> + <location filename="../src/gui/generalsettings.ui" line="269"/> <source>&Restart && Update</source> <translation>และเริ่มต้นใหม่ && อัปเดต</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="266"/> + <location filename="../src/gui/generalsettings.cpp" line="280"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>คุณไม่สามารถปิดใช้งานระบบเริ่มต้นอัตโนมัติได้เนื่องจาก system-wide ได้ถูกเปิดใช้งานแล้ว</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="176"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>Change update channel?</source> <translation>เปลี่ยนช่องทางการอัปเดต?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="177"/> + <location filename="../src/gui/generalsettings.cpp" line="191"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> - <translation>กำหนดช่องทางอัปเดตการติดตั้งใดสำหรับไคลเอ็นต์ "รุ่นเสถียร" จะอัปเกรดที่เชื่อถือได้จาก "รุ่นเบต้า" อาจมีคุณลักษณะใหม่และการแก้ไขปัญหาแต่ยังไม่ได้รับการทดสอบอย่างละเอียด + <translation>กำหนดช่องทางอัปเดตการติดตั้งใดสำหรับไคลเอ็นต์ "เวอร์ชันเสถียร" จะอัปเกรดที่เชื่อถือได้จาก "เวอร์ชันเบต้า" อาจมีคุณลักษณะใหม่และการแก้ไขปัญหาแต่ยังไม่ได้รับการทดสอบอย่างละเอียด -โปรดทราบว่าการเลือกนี้จะไม่สามารถดาวน์เกรดจากรุ่นเบต้าไปยังรุ่นเสถียรได้ ต้องรอให้รุ่นเสถียรใหม่กว่ารุ่นเบต้าก่อนถึงจะอัปเกรดเป็นรุ่นเสถียรได้</translation> +โปรดทราบว่าการเลือกนี้จะไม่สามารถดาวน์เกรดจากเวอร์ชันเบต้าไปยังเวอร์ชันเสถียรได้ ต้องรอให้เวอร์ชันเสถียรใหม่กว่าเวอร์ชันเบต้าก่อนถึงจะอัปเกรดเป็นเวอร์ชันเสถียรได้</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="190"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Change update channel</source> <translation>ตกลง</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="205"/> <source>Cancel</source> <translation>ยกเลิก</translation> </message> @@ -1587,41 +1623,31 @@ Note that this selects only what pool upgrades are taken from, and that there ar </message> <message> <location filename="../src/gui/ignorelisteditor.ui" line="20"/> - <source>Global Ignore Settings</source> - <translation>รายละเอียดการตั้งค่าทั่วไป</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.ui" line="26"/> - <source>Sync hidden files</source> - <translation>ประสานข้อมูลไฟล์ที่ถูกซ่อนอยู่</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.ui" line="36"/> <source>Files Ignored by Patterns</source> <translation>ข้ามไฟล์โดยรูปแบบ</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="75"/> + <location filename="../src/gui/ignorelisteditor.ui" line="59"/> <source>Add</source> <translation>เพิ่ม</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="57"/> + <location filename="../src/gui/ignorelisteditor.ui" line="41"/> <source>Pattern</source> <translation>รูปแบบ</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="62"/> + <location filename="../src/gui/ignorelisteditor.ui" line="46"/> <source>Allow Deletion</source> <translation>อนุญาตให้ลบ</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="85"/> + <location filename="../src/gui/ignorelisteditor.ui" line="69"/> <source>Remove</source> <translation>ลบออก</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="121"/> + <location filename="../src/gui/ignorelisteditor.ui" line="105"/> <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> @@ -1630,22 +1656,22 @@ Items where deletion is allowed will be deleted if they prevent a directory from รายการที่อนุญาตให้ลบจะถูกลบถึงแม้ว่าจะมีการป้องกันการลบไดเรกทอรีออก สิ่งนี้มีประโยชน์มากสำหรับข้อมูลเมตา</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="119"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="112"/> <source>Could not open file</source> <translation>ไม่สามารถเปิดไฟล์</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="120"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="113"/> <source>Cannot write changes to '%1'.</source> <translation>ไม่สามารถเขียนเปลี่ยนเป็น '%1'</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="146"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="132"/> <source>Add Ignore Pattern</source> <translation>เพิ่มการละเว้นรูปแบบ</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="147"/> + <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> <source>Add a new ignore pattern:</source> <translation>เพิ่มการละเว้นรูปแบบใหม่:</translation> </message> @@ -1746,38 +1772,56 @@ Items where deletion is allowed will be deleted if they prevent a directory from <context> <name>OCC::LogBrowser</name> <message> - <location filename="../src/gui/logbrowser.cpp" line="46"/> + <location filename="../src/gui/logbrowser.ui" line="14"/> <source>Log Output</source> <translation>ผลลัพธ์ของไฟล์ log</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="52"/> - <source>The client can write debug logs to a temporary folder. These logs are very helpful for diagnosing problems. -Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space. -If enabled, logs will be written to %1</source> - <translation>ไคลเอนต์สามารถเขียน log การตรวจแก้จุดบกพร่องไปยังโฟลเดอร์ชั่วคราว log เหล่านี้มีประโยชน์อย่างมากสำหรับใช้ค้นหาปัญหา -เนื่องจากไฟล์ log มีขนาดที่ใหญ่ขึ้นได้ ไคลเอ็นต์เวลาประสานข้อมูลใหม่แต่ละครั้งและบีบอัดไฟล์ที่เก่ากว่า ขอแนะนำให้เปิดใช้งานการลบไฟล์ log หลังจากผ่านไปสองสามชั่วโมงเพื่อหลีกเลี่ยงการใช้พื้นที่ดิสก์มากเกินไป -หากเปิดใช้งาน log จะถูกเขียนไปยัง %1</translation> - </message> - <message> - <location filename="../src/gui/logbrowser.cpp" line="66"/> + <location filename="../src/gui/logbrowser.ui" line="116"/> <source>Enable logging to temporary folder</source> <translation>เปิดใช้งานการเก็บบันทึกไปยังโฟลเดอร์ชั่วคราว</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> + <location filename="../src/gui/logbrowser.cpp" line="61"/> <source>Delete logs older than %1 hours</source> <translation>ลบ log ที่เก่ากว่า %1 ชั่วโมง</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.ui" line="53"/> + <source><html><head/><body><p><span style=" font-weight:600; color:#ff0000;">The logs contain sensitive information which you should not make publicly available</span></p></body></html></source> + <translation><html><head/><body><p><span style=" font-weight:600; color:#ff0000;">บันทึกมีข้อมูลที่ละเอียดอ่อนซึ่งคุณไม่ควรเปิดเผยต่อสาธารณะ</span></p></body></html></translation> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="71"/> + <source>The client can write debug logs to a temporary folder. These logs are very helpful for diagnosing problems. +Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space.</source> + <translation>ไคลเอนต์สามารถเขียนบันทึกการแก้ไขข้อบกพร่องไปยังโฟลเดอร์ชั่วคราว บันทึกเหล่านี้มีประโยชน์มากสำหรับการวินิจฉัยปัญหา +เนื่องจากไฟล์บันทึกมีขนาดใหญ่ไคลเอ็นต์จะเริ่มต้นไฟล์ใหม่สำหรับการซิงค์แต่ละครั้งและบีบอัดไฟล์เก่า ขอแนะนำให้เปิดใช้งานการลบไฟล์บันทึกหลังจากผ่านไปสองสามชั่วโมงเพื่อหลีกเลี่ยงการใช้พื้นที่ดิสก์มากเกินไป</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="84"/> + <source>If enabled, logs will be written to:</source> + <translation>หากเปิดใช้งานบันทึกจะถูกเขียนไปยัง: </translation> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="91"/> + <source>C:/log</source> + <translation>C:/log</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="123"/> + <source>Log Http traffic </source> + <translation>บันทึกการรับส่งข้อมูล HTTP</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.ui" line="143"/> <source>These settings persist across client restarts. Note that using any logging command line options will override the settings.</source> <translation>การตั้งค่าเหล่านี้ยังคงมีอยู่ระหว่างการรีสตาร์ทไคลเอ็นต์ โปรดทราบว่าการใช้ตัวเลือกการเก็บบันทึกคำสั่งจะแทนที่การตั้งค่า</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="85"/> + <location filename="../src/gui/logbrowser.ui" line="154"/> <source>Open folder</source> <translation>เปิดโฟลเดอร์</translation> </message> @@ -1785,12 +1829,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="186"/> + <location filename="../src/libsync/logger.cpp" line="177"/> <source>Error</source> <translation>ข้อผิดพลาด</translation> </message> <message> - <location filename="../src/libsync/logger.cpp" line="187"/> + <location filename="../src/libsync/logger.cpp" line="178"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>ไฟล์ '%1'<br/>ไม่สามารถเปิดขึ้นมาเพื่อเขียนข้อมูลได้<br/><br/>ผลลัพธ์ของไฟล์ log <b>ไม่สามารถ</b> บันทึกข้อมูลได้!</nobr></translation> </message> @@ -1800,18 +1844,18 @@ Note that using any logging command line options will override the settings.</so <message> <location filename="../src/gui/updater/ocupdater.cpp" line="391"/> <source>New Version Available</source> - <translation>มีรุ่นใหม่ที่สามารถใช้งานได้</translation> + <translation>มีเวอร์ชันใหม่ที่สามารถใช้งานได้</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="397"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> - <translation><p>%1 มีรุ่นใหม่ของไคลเอ็นต์แล้ว</p><p><b>%2</b> สามารถดาวน์โหลดได้ รุ่นที่ติดตั้งคือ %3</translation> + <translation><p>%1 มีเวอร์ชันใหม่ของไคลเอ็นต์แล้ว</p><p><b>%2</b> สามารถดาวน์โหลดได้ เวอร์ชันที่ติดตั้งคือ %3</translation> </message> <message> <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> + <translation>ข้ามเวอร์ชันนี้</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="411"/> @@ -1965,23 +2009,23 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NotificationWidget</name> <message> - <location filename="../src/gui/notificationwidget.cpp" line="65"/> + <location filename="../src/gui/notificationwidget.cpp" line="59"/> <source>Created at %1</source> <translation>ถูกสร้างแล้วที่ %1</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="78"/> + <location filename="../src/gui/notificationwidget.cpp" line="72"/> <source>Closing in a few seconds...</source> <translation>กำลังจะปิดในอีกไม่กี่วินาที ...</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="125"/> + <location filename="../src/gui/notificationwidget.cpp" line="119"/> <source>%1 request failed at %2</source> <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment> <translation>%1 ร้องขอล้มเหลวที่ %2</translation> </message> <message> - <location filename="../src/gui/notificationwidget.cpp" line="131"/> + <location filename="../src/gui/notificationwidget.cpp" line="125"/> <source>'%1' selected at %2</source> <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment> <translation>'%1' ได้เลือกแล้วที่ %2</translation> @@ -1990,68 +2034,74 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> + <location filename="../src/libsync/creds/oauth.cpp" line="127"/> <source>Error returned from the server: <em>%1</em></source> <translation>เกิดข้อผิดพลาดจากเซิร์ฟเวอร์: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="130"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>เกิดข้อผิดพลาดในการเข้าถึง 'โทเค็น' ปลายทาง: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="134"/> <source>Empty JSON from OAuth2 redirect</source> <translation>JSON ว่างเปล่าจากการเปลี่ยนเส้นทาง OAuth2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="139"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>ไม่สามารถแยกวิเคราะห์ JSON ที่ส่งมาจากเซิร์ฟเวอร์: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="142"/> <source>Unsupported token type: %1</source> - <translation type="unfinished"/> + <translation>ประเภทโทเค็นที่ไม่รองรับ: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="151"/> + <location filename="../src/libsync/creds/oauth.cpp" line="144"/> <source>The reply from the server did not contain all expected fields :%1</source> - <translation type="unfinished"/> + <translation>ข้อมูลที่ตอบกลับจากเซิร์ฟเวอร์ไม่พบฟิลด์ที่ต้องการ: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="153"/> + <location filename="../src/libsync/creds/oauth.cpp" line="146"/> <source>Unknown Error</source> - <translation type="unfinished"/> + <translation>ข้อผิดพลาดที่ไม่รู้จัก</translation> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> + <translation><h1>ข้อผิดพลาดในการเข้าสู่ระบบ</h1><p>เรียกข้อมูลผู้ใช้ไม่สำเร็จ</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="291"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> - <translation type="unfinished"/> + <translation>ข้อผิดพลาด: ไม่พบมีฟิลด์ %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="157"/> + <location filename="../src/libsync/creds/oauth.cpp" line="150"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>เข้าสู่ระบบล้มเหลว</h1>%1<p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="202"/> - <location filename="../src/libsync/creds/oauth.cpp" line="205"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> - <translation type="unfinished"/> + <translation>เกิดข้อผิดพลาดขณะรีเฟรชโทเค็น: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="214"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> - <translation type="unfinished"/> + <translation>ข้อมูลที่ตอบกลับจากเซิร์ฟเวอร์ไม่พบฟิลด์ที่ต้องการ: %1 +ข้อมูลที่ได้รับแล้ว: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="235"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>บัญผู้ใช้ไม่ถูกต้อง</h1> <p>คุณลงชื่อเข้าใช้ด้วยบัญชีผู้ใช้ <em>%1</em> คุณจะต้องลงชื่อเข้าใช้ด้วยบัญชี <em>%2</em> <br>โปรดออกจากระบบ %3 ในแท็บอื่นแล้ว <a href='%4'>คลิกที่นี่</a> เพื่อเข้าสู่ระบบในฐานะผู้ใช้ </p></translation> </message> @@ -2118,58 +2168,58 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="50"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/> <source>Connect to %1</source> <translation>เชื่อมต่อไปยัง %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="52"/> <source>Setup local folder options</source> <translation>ตั้งค่าตัวเลือกโฟลเดอร์ในเครื่อง</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="60"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="61"/> <source>Connect...</source> <translation>เชื่อมต่อ...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/> - <source>Use &virtual files instead of downloading content immediately %1</source> - <translation>ใช้ไฟล์ &virtual แทนที่จะดาวน์โหลดเนื้อหาแบบทันที %1</translation> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> + <source> (experimental)</source> + <translation>(โหมดเบต้า)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="84"/> - <source>(tech preview)</source> - <translation>(ตัวอย่างทางเทคนิค)</translation> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="89"/> + <source>Use &virtual files instead of downloading content immediately%1</source> + <translation>ใช้ไฟล์เสมือนแทนการดาวน์โหลดเนื้อหาแบบทันที %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="84"/> - <source>(experimental)</source> - <translation>(ทดลอง)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="177"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 โฟลเดอร์ '%2' ถูกประสานข้อมูลไปยังโฟลเดอร์ในเครื่อง '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="180"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <source>Sync the folder '%1'</source> <translation>ประสานข้อมูลโฟลเดอร์ '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="185"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="202"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>คำเตือน:</strong> โฟลเดอร์ในเครื่องจะต้องไม่ว่างเปล่า เลือกความละเอียด!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="283"/> + <source>Virtual files are not available for the selected folder</source> + <translation>ไฟล์เสมือนไม่พร้อมใช้งานสำหรับโฟลเดอร์ที่เลือก</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="343"/> <source>Local Sync Folder</source> <translation>ประสานโฟลเดอร์ในเครื่อง</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="352"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="387"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="377"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="412"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2228,17 +2278,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="44"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> <source>Connect to %1</source> <translation>เชื่อมต่อไปยัง %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> <source>Login in your browser</source> <translation>เข้าสู่ระบบในเบราเซอร์ของคุณ</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="55"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> <source>Copy link to clipboard</source> <translation>คัดลอกลิงก์ไปยังคลิปบอร์ด</translation> </message> @@ -2246,39 +2296,39 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> <source>Connect to %1</source> <translation>เชื่อมต่อไปยัง %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> <source>Setup %1 server</source> <translation>ติดตั้งเซิร์ฟเวอร์ %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="132"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation>URL นี้ไม่มีความปลอดภัยเพราะมันไม่ถูกเข้ารหัส ไม่แนะนำให้ใช้</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="136"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> <source>This url is secure. You can use it.</source> <translation>URL นี้มีความปลอดภัย คุณสามารถใช้มัน</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="175"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> <source>&Next ></source> <translation>และถัดไป ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> <source>Invalid URL</source> <translation>URL ไม่ถูกต้อง</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="318"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>ไม่สามารถโหลดใบรับรอง รหัสผ่านไม่ถูกต้อง?</translation> </message> @@ -2286,144 +2336,144 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="251"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="226"/> <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> - <translation><font color="green">เชื่อมต่อกับ %1: %2 รุ่น %3 (%4) เสร็จเรียบร้อยแล้ว</font><br/><br/></translation> + <translation><font color="green">เชื่อมต่อกับ %1: %2 เวอร์ชัน %3 (%4) เสร็จเรียบร้อยแล้ว</font><br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="254"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>ล้มเหลวในการเชื่อมต่อไปยัง %1 ที่ %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>หมดเวลาขณะที่พยายามเชื่อมต่อไปยัง %1 ที่ %2</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="316"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="291"/> <source>Trying to connect to %1 at %2...</source> <translation>กำลังพยายามเชื่อมต่อไปที่ %1 ที่ %2...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>คำขอการรับรองความถูกต้องไปยังเซิร์ฟเวอร์ที่ถูกเปลี่ยนเส้นทางไปยัง</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>มีการตอบสนองที่ไม่ถูกต้องที่จะร้องขอการรับรองความถูกต้องของ WebDAV</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>การเข้าถึงถูกระงับโดยเซิร์ฟเวอร์ เพื่อตรวจสอบว่าคุณมีการเข้าถึงที่เหมาะสม <a href="%1">คลิกที่นี่</a> เพื่อรเข้าถึงบริการกับเบราว์เซอร์ของคุณ</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="277"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/> <source>Invalid URL</source> <translation>URL ไม่ถูกต้อง</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="434"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>ประสานข้อมูลโฟลเดอร์ในเครื่อง %1 มีอยู่แล้ว กรุณาตั้งค่าเพื่อถ่ายข้อมูล <br/<br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>สร้างประสานข้อมูลโฟลเดอร์ในเครื่อง %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>ตกลง</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="443"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>ล้มเหลว</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>ไม่สามารถสร้างผสานข้อมูลโฟลเดอร์ในเครื่อง %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="471"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>ไม่มีโฟลเดอร์รีโมทที่ระบุ!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="477"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>ข้อผิดพลาด: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>กำลังสร้างโฟลเดอร์ใหม่บน ownCloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="506"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>โฟลเดอร์รีโมท %1 ถูกสร้างเรียบร้อยแล้ว</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>โฟลเดอร์รีโมทมี %1 อยู่แล้ว กำลังเชื่อมต่อเพื่อถ่ายโอนข้อมูล</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>การสร้างโฟลเดอร์ดังกล่าวส่งผลให้เกิดรหัสข้อผิดพลาด HTTP error code %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> - <translation>สร้างโฟลเดอร์ระยะไกลล้มเหลวเนื่องจากมีข้อมูลผิดพลาด!</translation> + <translation>สร้างโฟลเดอร์รีโมทล้มเหลวเนื่องจากมีข้อมูลผิดพลาด!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">การสร้างโฟลเดอร์รีโมทล้มเหลว ซึ่งอาจมีสาเหตุมาจากการกรอกข้อมูลส่วนตัวเพื่อเข้าใช้งานไม่ถูกต้อง.</font><br/>กรุณาย้อนกลับไปแล้วตรวจสอบข้อมูลส่วนตัวของคุณอีกครั้ง.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> - <translation>การสร้างโฟลเดอร์ระยะไกล %1 ล้มเหลวเนื่องข้อผิดพลาด <tt>%2</tt></translation> + <translation>การสร้างโฟลเดอร์รีโมท %1 ล้มเหลวเนื่องข้อผิดพลาด <tt>%2</tt></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> - <translation>การเชื่อมต่อเผื่อประสานข้อมูลจาก %1 ไปที่ไดเร็กทอรี่ระยะไกล %2 ได้ถูกติดตั้งแล้ว</translation> + <translation>การเชื่อมต่อเผื่อประสานข้อมูลจาก %1 ไปที่ไดเร็กทอรี่รีโมท %2 ได้ถูกติดตั้งแล้ว</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>เชื่อมต่อไปที่ %1! สำเร็จ</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>การเชื่อมต่อกับ %1 ไม่สามารถดำเนินการได้ กรุณาตรวจสอบอีกครั้ง</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="567"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>เปลี่ยนชื่อโฟลเดอร์ล้มเหลว</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="568"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>ไม่สามารถลบและสำรองข้อมูลโฟลเดอร์เพราะโฟลเดอร์หรือไฟล์ในนั้นจะเปิดในโปรแกรมอื่นอยู่ กรุณาปิดโฟลเดอร์หรือไฟล์และกดลองใหม่อีกครั้งหรือยกเลิกการติดตั้ง</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>ประสานข้อมูลโฟลเดอร์ในเครื่อง %1 ได้ถูกสร้างขึ้นเรียบร้อยแล้ว!</b></font></translation> </message> @@ -2431,44 +2481,22 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="78"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>%1 ตัวช่วยสร้างการเชื่อมต่อ</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="251"/> - <source>Enable technical preview feature?</source> - <translation>เปิดใช้งานคุณลักษณะตัวอย่างทางเทคนิค?</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/> - <source>When the "virtual files" 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.</source> - <translation>เมื่อเปิดใช้งานโหมด "ไฟล์เสมือน" จะไม่มีการดาวน์โหลดไฟล์ใดๆ ในช่วงแรกแต่จะสร้างไฟล์เสมือนสำหรับแต่ละไฟล์ที่มีอยู่บนเซิร์ฟเวอร์แทน เมื่อไฟล์ถูกเปิดในเครื่องเนื้อหาจะถูกดาวน์โหลดโดยอัตโนมัติ หรือสามารถดาวน์โหลดไฟล์ด้วยตนเองได้โดยใช้เมนูบริบท</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="260"/> - <source>Enable virtual files</source> - <translation>เปิดใช้งานไฟล์เสมือน</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="261"/> - <source>Continue to use selective sync</source> - <translation>ใช้การประสานข้อมูลที่เลือกต่อไป</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="266"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation>เปิดใช้งานโหมดเบต้า?</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="280"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="271"/> <source>Enable experimental placeholder mode</source> - <translation>เปิดใช้งานโหมด placeholder แบบทดลอง</translation> + <translation>เปิดใช้งานโหมดเบต้า</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="267"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/> <source>When the "virtual files" mode is enabled no files will be downloaded initially. Instead, a tiny "%1" 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. @@ -2483,7 +2511,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="281"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation>ไว้คราวหน้า</translation> </message> @@ -2612,12 +2640,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>เซิร์ฟเวอร์รายงานว่าไม่มี %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1246"/> + <location filename="../src/libsync/discovery.cpp" line="1244"/> <source>Moved to invalid target, restoring</source> <translation>ย้ายไปยังเป้าหมายที่ไม่ถูกต้อง กำลังดำเนินการกู้คืน</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1259"/> + <location filename="../src/libsync/discovery.cpp" line="1257"/> <source>Not allowed to remove, restoring</source> <translation>ไม่อนุญาตให้ลบเพราะกำลังฟื้นฟู</translation> </message> @@ -2637,17 +2665,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ไม่ได้รับอนุญาต เพราะคุณไม่มีสิทธิ์ที่จะเพิ่มไฟล์ในโฟลเดอร์นั้น</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1223"/> + <location filename="../src/libsync/discovery.cpp" line="1222"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>ไม่อนุญาตให้อัปโหลดไฟล์นี้เพราะมันจะอ่านได้เพียงอย่างเดียวบนเซิร์ฟเวอร์ กำลังกู้คืน</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1368"/> + <location filename="../src/libsync/discovery.cpp" line="1367"/> <source>Error while reading the database</source> <translation>เกิดข้อผิดพลาดขณะอ่านฐานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1428"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>เซิร์ฟเวอร์ตอบกลับพร้อมข้อผิดพลาดขณะอ่านไดเรกทอรีแล้ว '%1' : %2</translation> </message> @@ -2655,7 +2683,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1001"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1006"/> <source>Error writing metadata to the database</source> <translation>ข้อผิดพลาดในการเขียน metadata ไปยังฐานข้อมูล</translation> </message> @@ -2725,22 +2753,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalMkdir</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="147"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="146"/> <source>could not delete file %1, error: %2</source> <translation>ไม่สามารถลบไฟล์ %1, ข้อผิดพลาด: %2</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="162"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> <source>Attention, possible case sensitivity clash with %1</source> <translation>คำเตือน เคสที่เป็นไปไม่ได้มีผลกับ %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="168"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> <source>could not create folder %1</source> <translation>ไม่สามารถสร้างโฟลเดอร์ %1</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="179"/> <source>Error writing metadata to the database</source> <translation>ข้อผิดพลาดในการเขียน metadata ไปยังฐานข้อมูล</translation> </message> @@ -2748,7 +2776,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalRemove</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="100"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> <source>Could not remove %1 because of a local file name clash</source> <translation>ไม่สามารถลบ %1 เพราะชื่อไฟล์ในเครื่องเหมือนกัน!</translation> </message> @@ -2756,18 +2784,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="218"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>ไม่สามารถเปลี่ยนชื่อไฟล์ %1 เป็น %2 เพราะไฟล์ชื่อนี้มีอยู่แล้ว</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="249"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="255"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="248"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="254"/> <source>Error writing metadata to the database</source> <translation>ข้อผิดพลาดในการเขียน metadata ไปยังฐานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="261"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> <source>Error setting pin state</source> <translation>เกิดข้อผิดพลาดขณะตั้งค่าสถานะพิน</translation> </message> @@ -2846,7 +2874,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>การอัปโหลด %1 เกินโควต้าของโฟลเดอร์</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="663"/> + <location filename="../src/libsync/propagateupload.cpp" line="677"/> <source>Error writing metadata to the database</source> <translation>ข้อผิดพลาดในการเขียน metadata ไปยังฐานข้อมูล</translation> </message> @@ -2887,14 +2915,14 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileTUS</name> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="202"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> - <translation type="unfinished"/> + <translation>ไฟล์ในเครื่องถูกลบออกในระหว่างการประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="213"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> - <translation type="unfinished"/> + <translation>ไฟล์ในเครื่องถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล</translation> </message> </context> <context> @@ -3064,45 +3092,45 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SettingsDialog</name> <message> - <location filename="../src/gui/settingsdialog.cpp" line="117"/> + <location filename="../src/gui/settingsdialog.cpp" line="196"/> <source>Settings</source> <translation>ตั้งค่า</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="108"/> + <location filename="../src/gui/settingsdialog.cpp" line="187"/> <source>Activity</source> <translation>กิจกรรม</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="128"/> - <location filename="../src/gui/settingsdialog.cpp" line="131"/> + <location filename="../src/gui/settingsdialog.cpp" line="176"/> + <source>Add account</source> + <translation>เพิ่มบัญชี</translation> + </message> + <message> + <location filename="../src/gui/settingsdialog.cpp" line="207"/> + <location filename="../src/gui/settingsdialog.cpp" line="210"/> <source>Quit %1</source> <translation>ออก %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="132"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> <source>Are you sure you want to quit %1?</source> <translation>แน่ใจหรือไม่ว่าคุณต้องการออกจาก %1?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="254"/> + <location filename="../src/gui/settingsdialog.cpp" line="342"/> <source>Account</source> <translation>บัญชี</translation> </message> <message> <location filename="../src/gui/settingsdialog.ui" line="14"/> <source>MainWindow</source> - <translation type="unfinished"/> + <translation>หน้าจอหลัก</translation> </message> <message> <location filename="../src/gui/settingsdialog.ui" line="39"/> <source>Hide</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/settingsdialog.ui" line="49"/> - <source>toolBar</source> - <translation type="unfinished"/> + <translation>ซ๋อน</translation> </message> </context> <context> @@ -3128,42 +3156,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>พาธ ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="108"/> + <location filename="../src/gui/sharedialog.cpp" line="110"/> <source>%1 Sharing</source> <translation>กำลังแชร์ %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="86"/> + <location filename="../src/gui/sharedialog.cpp" line="88"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="105"/> + <location filename="../src/gui/sharedialog.cpp" line="107"/> <source>Folder: %2</source> <translation>โฟลเดอร์: %2 </translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="111"/> + <location filename="../src/gui/sharedialog.cpp" line="113"/> <source>The server does not allow sharing</source> <translation>เซิร์ฟเวอร์ไม่อนุญาตให้แชร์</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="127"/> + <location filename="../src/gui/sharedialog.cpp" line="129"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>คุณใช้สิทธิ์การเรียกข้อมูลจากเซิฟเวอร์สูงสุดแล้ว</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="197"/> + <location filename="../src/gui/sharedialog.cpp" line="202"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>ไม่สามารถแชร์ไฟล์เพราะไม่ได้รับอนุญาต</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="211"/> + <location filename="../src/gui/sharedialog.cpp" line="216"/> <source>Users and Groups</source> <translation>ผู้ใช้และกลุ่ม</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="218"/> + <location filename="../src/gui/sharedialog.cpp" line="223"/> <source>Public Links</source> <translation>ลิงก์สาธารณะ</translation> </message> @@ -3238,7 +3266,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sharelinkwidget.ui" line="137"/> <source>Recipients can view, download, edit, delete and upload contents.</source> - <translation>ผู้รับสามารถดู ดาวน์โหลด แก้ไข ลบและอัปโหลดเนื้อหาได้</translation> + <translation>ผู้รับสามารถดู ดาวน์โหลด แก้ไข ลบและอัปโหลดเนื้อหา</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.ui" line="20"/> @@ -3358,32 +3386,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation><html><head/><body><p>คุณสามารถให้คนอื่นเข้าถึงไฟล์หรือโฟลเดอร์ที่คุณแชร์นี้ได้<a href="private link menu"><span style=" text-decoration: underline">โดยส่งลิงก์ส่วนตัวไปให้คนที่คุณต้องการแชร์</span></a></p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="210"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> <source>The item is not shared with any users or groups</source> <translation>รายการนี้ไม่ได้แชร์กับผู้ใช้หรือกลุ่มใดๆ</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="241"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> <source>Open link in browser</source> <translation>คัดลอกลิงก์ไปยังคลิปบอร์ด</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> <source>Copy link to clipboard</source> <translation>คัดลอกลิงก์ไปยังคลิปบอร์ด</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> <source>Send link by email</source> <translation>ส่งลิงก์ทางอีเมล</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="255"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> <source>No results for '%1'</source> <translation>ไม่มีผลลัพธ์สำหรับ '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> <source>I shared something with you</source> <translation>ฉันแชร์บางอย่างกับคุณ</translation> </message> @@ -3417,17 +3445,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> <source>create</source> <translation>สร้าง</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> <source>change</source> <translation>เปลี่ยนแปลง</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> <source>delete</source> <translation>ลบ</translation> </message> @@ -3678,7 +3706,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sslbutton.cpp" line="192"/> <source>Server version: %1</source> - <translation>รุ่นเซิร์ฟเวอร์: %1</translation> + <translation>เวอร์ชันเซิร์ฟเวอร์: %1</translation> </message> <message> <location filename="../src/gui/sslbutton.cpp" line="206"/> @@ -3794,17 +3822,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>มีเพียง %1 ที่พร้อมใช้งาน คุณจำเป็นต้องมีไม่น้อยกว่า %2 เพื่อเริ่มใช้งาน</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="482"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation>ไม่สามารถเปิดหรือสร้างฐานข้อมูลการประสานข้อมูลในเครื่อง ตรวจสอบว่าคุณมีสิทธิ์การเขียนในโฟลเดอร์ประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1035"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>พื้นที่จัดเก็บเหลือน้อย: การดาวน์โหลดจะช่วยลดพื้นที่ว่างด้านล่าง %1 ที่ถูกข้ามไป</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1042"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>มีพื้นที่ว่างไม่เพียงพอบนเซิร์ฟเวอร์สำหรับการอัปโหลดบางรายการ</translation> </message> @@ -3819,27 +3847,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ไม่สามารถอัปเดตข้อมูล metadata ของไฟล์เสมือน: %1</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="498"/> <source>Using virtual files with suffix, but suffix is not set</source> <translation>กำลังใช้ไฟล์เสมือนที่มีคำต่อท้าย แต่ไม่ได้ตั้งคำต่อท้าย</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="515"/> + <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>Unable to read the blacklist from the local database</source> <translation>ไม่สามารถอ่านบัญชีดำจากฐานข้อมูลในเครื่อง</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="546"/> + <location filename="../src/libsync/syncengine.cpp" line="541"/> <source>Unable to read from the sync journal.</source> <translation>ไม่สามารถอ่านจากบันทึกการประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="630"/> + <location filename="../src/libsync/syncengine.cpp" line="625"/> <source>Cannot open the sync journal</source> <translation>ไม่สามารถเปิดการผสานข้อมูลเจอร์นัล</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1018"/> <source>Aborted</source> <translation>ยกเลิกแล้ว</translation> </message> @@ -3855,279 +3883,276 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="341"/> - <source><p>Version %2. For more information visit <a href="%3">https://%4</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Hannah von Reth, and others.</small></p></source> - <translation><p>รุ่น %2. สำหรับข้อมูลเพิ่มเติมสามารถดูได้จาก <a href="%3">https://%4</a></p><p>หากต้องการความช่วยเหลือโปรดไปที่: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>โดย Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Hannah von Reth, Sunchai Paejaroenchai</small></p></translation> - </message> - <message> - <location filename="../src/libsync/theme.cpp" line="348"/> - <source><p>Copyright ownCloud GmbH</p></source> - <translation><p>ลิขสิทธิ์ ownCloud GmbH</p></translation> - </message> - <message> - <location filename="../src/libsync/theme.cpp" line="349"/> - <source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source> - <translation><p>เผยแพร่โดย %1 และมีใบอนุญาตภายใต้ GNU General Public License (GPL) รุ่น 2.0 <br/>%2 และการลงทะเบียนโลโก้ %2 เครื่องหมายการค้าของ %1 ในประเทศสหรัฐอเมริกา ประเทศอื่นๆ หรือทั้งสองอย่าง</p></translation> + <location filename="../src/libsync/theme.cpp" line="382"/> + <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> + <translation><p>เวอร์ชัน %1 สามารถดูข้อมูลเพิ่มเติมได้ที่ <a href="%2">https://%3</a></p><p>สำหรับแจ้งปัญหาที่พบและขอความช่วยเหลือโปรดไปที่:<a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, Sunchai Paejaroenchai และคนอื่นๆที่ไม่ได้กล่าวถึง</small></p><p>ลิขสิทธิ์ ownCloud GmbH</p><p>จัดจำหน่ายโดย %4 และได้รับอนุญาตภายใต้ GNU General Public License (GPL) เวอร์ชัน 2.0<br/>%5 และโลโก้ %5 เป็นเครื่องหมายการค้าจดทะเบียนของ %4 ในสหรัฐอเมริกาประเทศอื่นๆ หรือทั้งสองอย่าง</p><p><small>%6</small></p></translation> </message> </context> <context> <name>OCC::ValidateChecksumHeader</name> <message> - <location filename="../src/common/checksums.cpp" line="335"/> + <location filename="../src/common/checksums.cpp" line="330"/> <source>The checksum header is malformed.</source> <translation>การตรวจสอบส่วนหัวผิดรูปแบบ</translation> </message> <message> - <location filename="../src/common/checksums.cpp" line="362"/> + <location filename="../src/common/checksums.cpp" line="357"/> <source>The checksum header contained an unknown checksum type '%1'</source> <translation>จากการตรวจสอบส่วนหัวมีประเภทที่ไม่รู้จัก '%1'</translation> </message> <message> - <location filename="../src/common/checksums.cpp" line="366"/> - <source>The downloaded file does not match the checksum, it will be resumed.</source> - <translation>ไฟล์ที่ดาวน์โหลดมาไม่ตรงกับการตรวจสอบที่กลับคืนมา</translation> + <location filename="../src/common/checksums.cpp" line="361"/> + <source>The downloaded file does not match the checksum, it will be resumed. '%1' != '%2'</source> + <translation>ไฟล์ที่ดาวน์โหลดหากตรวจพบ checksum ไม่ตรงกันจะถูกเรียกคืน '%1' != '%2'</translation> + </message> +</context> +<context> + <name>OCC::Vfs</name> + <message> + <location filename="../src/common/vfs.cpp" line="72"/> + <source>The Virtual filesystem feature requires a NTFS file system, %1 is using %2</source> + <translation>คุณลักษณะระบบไฟล์เสมือนต้องการระบบไฟล์ NTFS, %1 กำลังใช้งาน %2</translation> </message> </context> <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="267"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Please sign in</source> <translation>กรุณาเข้าสู่ระบบ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="313"/> + <location filename="../src/gui/owncloudgui.cpp" line="304"/> <source>Folder %1: %2</source> <translation>โฟลเดอร์ %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>ไม่มีการกำหนดค่าการประสานข้อมูลโฟลเดอร์</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="340"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>เปิดในเบราว์เซอร์</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="389"/> - <location filename="../src/gui/owncloudgui.cpp" line="712"/> - <location filename="../src/gui/owncloudgui.cpp" line="806"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Log in...</source> <translation>เข้าสู่ระบบ...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="393"/> - <location filename="../src/gui/owncloudgui.cpp" line="704"/> - <location filename="../src/gui/owncloudgui.cpp" line="808"/> + <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Log out</source> <translation>ออกจากระบบ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="499"/> + <location filename="../src/gui/owncloudgui.cpp" line="490"/> <source>Recent Changes</source> <translation>การเปลี่ยนแปลงล่าสุด</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="358"/> <source>Managed Folders:</source> <translation>โฟลเดอร์ที่มีการจัดการแล้ว:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="361"/> <source>Open folder '%1'</source> <translation>เปิดโฟลเดอร์ '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="342"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>เปิด %1 ในเบราว์เซอร์</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="190"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation>เซิร์ฟเวอร์ในบัญชี %1 ไม่รองรับการทำงานกับ %2 ซึ่งอาจเป็นอันตราย ดำเนินการตามความเสี่ยงของคุณเอง</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="789"/> + <location filename="../src/gui/owncloudgui.cpp" line="780"/> <source>Unknown status</source> <translation>สถานะที่ไม่รู้จัก</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Settings...</source> <translation>ตั้งค่า...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>Details...</source> <translation>รายละเอียด...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="799"/> + <location filename="../src/gui/owncloudgui.cpp" line="790"/> <source>Help</source> <translation>ช่วยเหลือ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="803"/> + <location filename="../src/gui/owncloudgui.cpp" line="794"/> <source>Quit %1</source> <translation>ออก %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="248"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Disconnected from %1</source> <translation>ถูกตัดการเชื่อมต่อจาก %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="198"/> + <location filename="../src/gui/owncloudgui.cpp" line="189"/> <source>Unsupported Server Version</source> - <translation>ไม่สนับสนุนรุ่นของ Server</translation> + <translation>ไม่สนับสนุนเวอร์ชันของ Server</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="238"/> + <location filename="../src/gui/owncloudgui.cpp" line="229"/> <source>Disconnected</source> <translation>ยกเลิกการเชื่อมต่อ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="240"/> + <location filename="../src/gui/owncloudgui.cpp" line="231"/> <source>Disconnected from some accounts</source> <translation>ยกเลิกการเชื่อมต่อจากบางบัญชี</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from accounts:</source> <translation>ยกเลิกการเชื่อมต่อจากบัญชี:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="253"/> + <location filename="../src/gui/owncloudgui.cpp" line="244"/> <source>Account %1: %2</source> <translation>บัญชี %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> <source>Signed out</source> <translation>ออกจากระบบ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="272"/> + <location filename="../src/gui/owncloudgui.cpp" line="263"/> <source>Account synchronization is disabled</source> <translation>บัญชีประสานข้อมูลถูกปิดใช้งาน</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="264"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>หยุดการประสานข้อมูลแล้ว</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="321"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>Unresolved conflicts</source> <translation>มีข้อขัดแย้งที่ยังไม่ได้รับการแก้ไข</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="328"/> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>เกิดข้อผิดพลาดขณะทำการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>ไม่ได้กำหนดค่าโฟลเดอร์ที่จะประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="378"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Unpause all folders</source> <translation>ทำโฟลเดอร์ทั้งหมดต่อ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="383"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> <source>Pause all folders</source> <translation>หยุดโฟลเดอร์ทั้งหมดชั่วคราว</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="683"/> + <location filename="../src/gui/owncloudgui.cpp" line="674"/> <source>Unpause all synchronization</source> <translation>ประสานข้อมูลทั้งหมดต่อ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="685"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause synchronization</source> <translation>ประสานข้อมูลต่อ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="693"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Pause all synchronization</source> <translation>หยุดการประสานข้อมูลทั้งหมดชั่วคราว</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause synchronization</source> <translation>หยุดการประสานข้อมูลชั่วคราว</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="702"/> + <location filename="../src/gui/owncloudgui.cpp" line="693"/> <source>Log out of all accounts</source> <translation>ออกจากระบบของบัญชีทั้งหมด</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="710"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> <source>Log in to all accounts...</source> <translation>เข้าสู่ระบบของบัญชีทั้งหมด...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>New account...</source> <translation>สร้างบัญชีใหม่...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="801"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>About %1</source> <translation>เกี่ยวกับ %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="834"/> + <location filename="../src/gui/owncloudgui.cpp" line="825"/> <source>No items synced recently</source> <translation>ไม่มีรายการที่ถูกประสานข้อมูลเมื่อเร็วๆ นี้</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="856"/> + <location filename="../src/gui/owncloudgui.cpp" line="847"/> <source>Checking for changes in remote '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในรีโมต '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in local '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในเครื่อง '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="874"/> + <location filename="../src/gui/owncloudgui.cpp" line="865"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>กำลังประสานข้อมูล %1 จาก %2 (เหลือ %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="879"/> + <location filename="../src/gui/owncloudgui.cpp" line="870"/> <source>Syncing %1 of %2</source> <translation>กำลังประสานข้อมูล %1 จากทั้งหมด %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="888"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 (%2 left)</source> <translation>กำลังประสานข้อมูล %1 (เหลือ %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="891"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1</source> <translation>กำลังประสานข้อมูล %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="909"/> + <location filename="../src/gui/owncloudgui.cpp" line="899"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> <source>Up to date</source> <translation>ถึงวันที่</translation> </message> @@ -4141,84 +4166,82 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="52"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="108"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="214"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="317"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="490"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="501"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="135"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="234"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="553"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="564"/> <source>TextLabel</source> <translation>ป้ายข้อความ</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="62"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="86"/> <source>Server</source> <translation>เซิร์ฟเวอร์</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="415"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="477"/> <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source> <translation><html><head/><body><p>ถ้ากล่องนี้ถูกตรวจสอบ โฟลเดอร์ในเครื่องจะถูกลบเพื่อเริ่มต้นล้างการประสานข้อมูลจากเซิร์ฟเวอร์</p><p>ไม่ต้องตรวจสอบนี้หากเนื้อหาต้นทางได้รับการอัปโหลดไปยังโฟลเดอร์เซิร์ฟเวอร์</p></body></html></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="418"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="480"/> <source>Start a &clean sync (Erases the local folder!)</source> <translation>เริ่มต้นทำความสะอาดการประสานข้อมูล (ลบโฟลเดอร์ในเครื่อง)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="152"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="192"/> <source>Ask for confirmation before synchroni&zing folders larger than</source> <translation>ถามก่อนที่จะประสานข้อมูลกับโฟลเดอร์ที่มีขนาดใหญ่กว่า</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="169"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="209"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>เมกะไบต์</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="178"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="218"/> <source>Ask for confirmation before synchronizing e&xternal storages</source> <translation>ถามก่อนที่จะประสานข้อมูลกับพื้นที่จัดเก็บข้อมูลภายนอก</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="207"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="227"/> <source>Choose what to sync</source> <translation>เลือกข้อมูลที่ต้องการประสาน</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="272"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="275"/> <source><html><head/><body><p>When this option is selected, the wizard will close without synchronizing anything. You can use the &quot;Add Folder Sync Connection&quot; button from the account settings to choose which pair of local and remote folder you wish to synchronize</p></body></html></source> <translation><html><head/><body><p>เมื่อตัวเลือกนี้ถูกเลือก วิซาร์ดจะปิดโดยไม่ได้ประสานข้อมูล คุณสามารกดเพิ่มโฟลเดอร์ที่ต้องการการประสานข้อมูลในการตั้งค่าบัญชี</p></body></html></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="253"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/> <source>Manually create folder sync connections </source> <translation>สร้างการประสานข้อมูลโฟลเดอร์ด้วยตัวเอง</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="333"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> <source>&Local Folder</source> <translation>และโฟลเดอร์ในเครื่อง</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="374"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="436"/> <source>pbSelectLocalFolder</source> <translation>pbSelectLocalFolder</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="405"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="467"/> <source>&Keep local data</source> <translation>และเก็บข้อมูลในเครื่อง</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="125"/> <source>S&ynchronize everything from server (recommended)</source> <translation>ประสานข้อมูลทุกอย่างจากเซิร์ฟเวอร์ (แนะนำ)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="435"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="498"/> <source>Status message</source> <translation>ข้อความสถานะ</translation> </message> @@ -4273,7 +4296,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="196"/> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> <source>TextLabel</source> <translation>ป้ายข้อความ</translation> </message> @@ -4288,7 +4311,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="160"/> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> <source>Error Label</source> <translation>ป้ายกำกับผิดพลาด</translation> </message> @@ -4320,37 +4343,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>ในอนาคต</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="444"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>%n วันที่ผ่านมา</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>%n ชั่วโมงที่ผ่านมา</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="457"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>ตอนนี้</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="459"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>ไม่กี่นาทีที่ผ่านมา</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="462"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>%n นาทีที่ผ่านมา</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>บางเวลาที่ผ่านมา</translation> </message> @@ -4384,37 +4407,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="316"/> + <location filename="../src/common/utility.cpp" line="317"/> <source>%n year(s)</source> <translation><numerusform>%n ปี</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="317"/> + <location filename="../src/common/utility.cpp" line="318"/> <source>%n month(s)</source> <translation><numerusform>%n เดือน</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="319"/> <source>%n day(s)</source> <translation><numerusform>%n วัน</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n hour(s)</source> <translation><numerusform>%n ชั่วโมง</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n minute(s)</source> <translation><numerusform>%n นาที</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n second(s)</source> <translation><numerusform>%n วินาที</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="345"/> + <location filename="../src/common/utility.cpp" line="346"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4433,11 +4456,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>ownCloudTheme::about()</name> + <name>ownCloudTheme::aboutVersions()</name> + <message> + <location filename="../src/libsync/theme.cpp" line="360"/> + <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> + <translation>%1 %2 %3 %4 %8 %9 ห้องสมุด Qt %5, %6%8 กำลังใช้ปลั๊กอินไฟล์เสมือน: %7</translation> + </message> +</context> +<context> + <name>ownCloudTheme::qtVer</name> + <message> + <location filename="../src/libsync/theme.cpp" line="350"/> + <source>%1 (Built against Qt %1)</source> + <translation>%1 (สร้างขึ้นเพื่อต่อต้าน Qt %1)</translation> + </message> +</context> +<context> + <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="320"/> - <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> - <translation><p><small>ที่สร้างขึ้นจากการแก้ไข Git <a href="%1">%2</a> บน %3, %4 กำลังใช้ Qt %5, %6</small></p></translation> + <location filename="../src/libsync/theme.cpp" line="355"/> + <source>%1 %2</source> + <translation>%1 %2</translation> </message> </context> <context> @@ -4465,7 +4504,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/progressdispatcher.cpp" line="43"/> <source>Server version downloaded, copied changed local file into conflict file</source> - <translation>ดาวน์โหลดรุ่นของเซิฟเวอร์แล้ว และได้ถูกคัดลอกและเปลี่ยนแปลงไฟล์ในเครื่องแทนไฟล์ที่มีปัญหา</translation> + <translation>ดาวน์โหลดเวอร์ชันของเซิฟเวอร์แล้ว และได้ถูกคัดลอกและเปลี่ยนแปลงไฟล์ในเครื่องแทนไฟล์ที่มีปัญหา</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="45"/> @@ -4543,52 +4582,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>สถานะไม่สามารถระบุได้</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>กำลังรอการเริ่มต้นประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>การประสานข้อมูลกำลังทำงาน</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>การประสานข้อมูลเสร็จสิ้น</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>ประสานข้อมูลสำเร็จ บางไฟล์ถูกละเลย</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>ประสานข้อมูลผิดพลาด</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>เกิดข้อผิดพลาดในการตั้งค่า</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>เตรียมความพร้อมในการประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>กำลังยกเลิก...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>การประสานข้อมูลถูกหยุดชั่วคราว</translation> </message> @@ -4596,53 +4635,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>utility</name> <message> - <location filename="../src/gui/guiutility.cpp" line="38"/> + <location filename="../src/gui/guiutility.cpp" line="39"/> <source>Could not open browser</source> <translation>ไม่สามารถเปิดเบราเซอร์</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="39"/> + <location filename="../src/gui/guiutility.cpp" line="40"/> <source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source> <translation>เกิดข้อผิดพลาดขณะเปิดเบราว์เซอร์เพื่อไปที่ URL %1 อาจยังไม่มีการกำหนดค่าเบราเซอร์เริ่มต้น</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="62"/> + <location filename="../src/gui/guiutility.cpp" line="63"/> <source>Could not open email client</source> <translation>ไม่สามารถเปิดไคลเอนต์อีเมล</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="63"/> + <location filename="../src/gui/guiutility.cpp" line="64"/> <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source> <translation>เกิดข้อผิดพลาดเมื่อเปิดไคลเอ็นต์อีเมลเพื่อสร้างข้อความใหม่ บางทีไคลเอ็นต์อีเมลอาจยังไม่ได้ตั้งค่า?</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="78"/> + <location filename="../src/gui/guiutility.cpp" line="79"/> <source>Always available locally</source> <translation>พร้อมใช้งานแบบในเครื่องเสมอ</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="82"/> + <location filename="../src/gui/guiutility.cpp" line="83"/> <source>Some available online only</source> <translation>พร้อมใช้งานแบบออนไลน์แค่บางอย่างเท่านั้น</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="84"/> - <location filename="../src/gui/guiutility.cpp" line="86"/> + <location filename="../src/gui/guiutility.cpp" line="85"/> + <location filename="../src/gui/guiutility.cpp" line="87"/> <source>Available online only</source> <translation>พร้อมใช้งานแบบออนไลน์เท่านั้น</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="80"/> + <location filename="../src/gui/guiutility.cpp" line="81"/> <source>Currently available locally</source> <translation>ปัจจุบันสามารถใช้งานแบบในเครื่องได้</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="93"/> + <location filename="../src/gui/guiutility.cpp" line="94"/> <source>Make always available locally</source> <translation>ทำให้ใช้งานแบบในเครื่องเสมอ</translation> </message> <message> - <location filename="../src/gui/guiutility.cpp" line="98"/> + <location filename="../src/gui/guiutility.cpp" line="99"/> <source>Free up local space</source> <translation>เพิ่มพื้นที่ว่าง</translation> </message> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index ccfe7f6cf..4c250c372 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -146,7 +146,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="131"/> + <location filename="../src/libsync/account.cpp" line="121"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -517,12 +517,12 @@ Bu eylem, o anda çalışan herhangi senkronizasyon işlemini iptal edecektir.</ <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 - %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%2 üzerinde %1 (bağlantı kesildi)</translation> </message> @@ -2076,7 +2076,7 @@ Günlüğe kaydetme komut satırı seçeneklerinin kullanılmasının bu ayarlar <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="295"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation> Error: Missing field %1 @@ -2088,14 +2088,14 @@ Günlüğe kaydetme komut satırı seçeneklerinin kullanılmasının bu ayarlar <translation><h1>Sisteme Giriş Hatası</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="206"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation>Error while refreshing the token: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="218"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2104,7 +2104,7 @@ Received data: %2</source> Received data: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="239"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>Yanlış kullanıcı</h1><p>Sisteme giriş yapmış olan kullanıcı<em>%1</em>, ama giriş yapması gereken kullanıcı <em>%2</em>.<br>Lütfen, başka bir sekmedeki %3 üzerinden sistemden çıkın, sonra <a href='%4'>buraya tıklayın </a> ve %2 olarak giriş yapın</p></translation> </message> @@ -2359,17 +2359,17 @@ Kullanmanız önerilmez.</translation> <translation>%2 üzerinde %1 bağlantısı deneniyor...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>Sunucuda giriş sırasında istek '%1' adresine yönlendirilmiş. Adres hatalı veya sunucu yanlış ayarlanmış.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>Yetkilendirilmiş webdav isteği geçersiz bir cevap alındı</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="370"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>Erişim sunucu tarafından yasaklandı. Geçerli erişime sahip olup olmadığınızı doğrulamak için hizmete web tarayıcınızla erişmek üzere <a href="%1">buraya tıklayın</a>.</translation> </message> @@ -2379,104 +2379,104 @@ Kullanmanız önerilmez.</translation> <translation>Geçersiz URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Yerel eşitleme klasörü %1 zaten mevcut, eşitlemek için ayarlanıyor.<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="427"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>Yerel eşitleme klasörü %1 oluşturuluyor...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>tamam</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="433"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>başarısız.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="435"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>%1 yerel klasörü oluşturulamadı</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>Uzak klasör belirtilmemiş!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>Hata: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="480"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>ownCloud üzerinde klasör oluşturuluyor: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>%1 uzak klasörü başarıyla oluşturuldu.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Uzak klasör %1 zaten mevcut. Eşitlemek için bağlanılıyor.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="502"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Klasör oluşturma %1 HTTP hata kodu ile sonuçlandı</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="504"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Uzak klasör oluşturması, geçersiz kimlik bilgileri nedeniyle başarısız!<br/>Lütfen geri gidin ve bilgileri denetleyin.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Uzak klasör oluşturma muhtemelen hatalı kimlik bilgilerinden dolayı başarısız oldu.</font><br/>Lütfen geri gidip kimlik bilgilerini doğrulayın.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Uzak klasör %1 oluşturma işlemi <tt>%2</tt> hatası ile başarısız oldu.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>%1 kaynaklı %2 uzak dizinine bir eşitleme bağlantısı ayarlandı.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>%1 bağlantısı başarılı!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>%1 bağlantısı kurulamadı. Lütfen tekrar denetleyin.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>Klasör adlandırma başarısız</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Klasör veya içerisindeki bir dosya farklı bir program içerisinde açık olduğundan, kaldırma ve yedekleme işlemi yapılamıyor. Lütfen klasör veya dosyayı kapatıp yeniden deneyin veya kurulumu iptal edin.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="610"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Yerel eşitleme klasörü %1 başarıyla oluşturuldu!</b></font></translation> </message> @@ -3890,7 +3890,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="357"/> + <location filename="../src/libsync/theme.cpp" line="382"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4350,37 +4350,37 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>gelecekte</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>%n gün önce</numerusform><numerusform>%n gün önce</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>%n saat önce</numerusform><numerusform>%n saat önce</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>şimdi</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>1 dakika önce</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>%n dakika önce</numerusform><numerusform>%n dakika önce</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>Bir süre önce</translation> </message> @@ -4465,7 +4465,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="332"/> + <location filename="../src/libsync/theme.cpp" line="360"/> <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> <translation type="unfinished"/> </message> @@ -4473,7 +4473,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="322"/> + <location filename="../src/libsync/theme.cpp" line="350"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4481,7 +4481,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="327"/> + <location filename="../src/libsync/theme.cpp" line="355"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4589,52 +4589,52 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>Tanımsız durum</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>Eşitlemenin başlanması bekleniyor</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>Eşitleme çalışıyor</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>Eşitleme Başarılı</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>Eşitleme Başarılı, bazı dosyalar yoksayıldı.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>Eşitleme Hatası</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>Kurulum Hatası</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>Eşitleme için hazırlanıyor</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>İptal ediliyor...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>Eşitleme duraklatıldı</translation> </message> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index e6fe6397e..899303dc2 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -146,7 +146,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="131"/> + <location filename="../src/libsync/account.cpp" line="121"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -513,12 +513,12 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1, %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1, %2 (连接已断开)</translation> </message> @@ -2063,7 +2063,7 @@ Note that using any logging command line options will override the settings.</so <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="295"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation type="unfinished"/> @@ -2074,21 +2074,21 @@ Note that using any logging command line options will override the settings.</so <translation><h1>登录错误</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="206"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="218"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="239"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>错误用户</h1><p>你登陆的用户<em>%1</em>,但必须以用户<em>%2</em>的身份登录.<br>请在另一个标签 %3登出,然后<a href='%4'>点击这</a>并以用户%2登录</p></translation> </message> @@ -2342,17 +2342,17 @@ It is not advisable to use it.</source> <translation>尝试连接位于 %2 的 %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>被发送到服务器的认证请求被重定向到'%1'。此URL无效，服务器配置错误。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>对于一个验证的 webdav 请求，有一个无效的响应</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="370"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>服务器拒绝了访问。<a href="%1">点击这里打开浏览器</a> 来确认您是否有权访问。</translation> </message> @@ -2362,104 +2362,104 @@ It is not advisable to use it.</source> <translation>无效URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>本地同步文件夹 %1 已存在，将使用它来同步。<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="427"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>创建本地同步目录%1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>成功</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="433"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>失败</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="435"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>不能创建本地文件夹 %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>未指定远程文件夹！</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>错误：%1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="480"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>在 ownCloud 创建文件夹：%1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>远程目录%1成功创建。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>远程文件夹 %1 已存在。连接它以供同步。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="502"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>创建文件夹出现 HTTP 错误代码 %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="504"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>远程文件夹创建失败，因为提供的凭证有误！<br/>请返回并检查您的凭证。</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">远程文件夹创建失败，可能是由于提供的用户名密码不正确。</font><br/>请返回并检查它们。</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>创建远程文件夹 %1 失败，错误为 <tt>%2</tt>。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>已经设置了一个 %1 到远程文件夹 %2 的同步连接</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>成功连接到了 %1！</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>无法建立到 %1的链接，请稍后重试（这里“稍后”用对了，赞！）。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>文件夹更名失败</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>无法移除和备份文件夹，由于文件夹或文件正在被另一程序占用。请关闭程序后重试，或取消安装。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="610"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>本地同步目录 %1 已成功创建</b></font></translation> </message> @@ -3867,7 +3867,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="357"/> + <location filename="../src/libsync/theme.cpp" line="382"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4327,37 +4327,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>将来</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>%n 天前</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>%n 小时前</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>现在</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>刚刚</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>%n 分钟前</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>之前</translation> </message> @@ -4442,7 +4442,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="332"/> + <location filename="../src/libsync/theme.cpp" line="360"/> <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> <translation type="unfinished"/> </message> @@ -4450,7 +4450,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="322"/> + <location filename="../src/libsync/theme.cpp" line="350"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4458,7 +4458,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="327"/> + <location filename="../src/libsync/theme.cpp" line="355"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4566,52 +4566,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>状态未定义</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>等待同步启动</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>同步运行中</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>同步成功</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>同步成功，部分文件被忽略。</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>同步错误</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>关闭</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>正在准备同步</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>正在撤销...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>同步被暂停</translation> </message> diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 9a910cf34..9225e3381 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -146,7 +146,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="131"/> + <location filename="../src/libsync/account.cpp" line="121"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -517,12 +517,12 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::ActivityItemDelegate</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="140"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> <source>%1 on %2</source> <translation>%1 在 %2 之上</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="142"/> + <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> <source>%1 on %2 (disconnected)</source> <translation>%1 在 %2 之上 (已經離線)</translation> </message> @@ -2077,7 +2077,7 @@ Note that using any logging command line options will override the settings.</so <translation><h1>登錄錯誤</h1><p>檢索使用者信息失敗</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="295"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source> Error: Missing field %1 </source> <translation> 錯誤:遺失領域%1 @@ -2089,14 +2089,14 @@ Note that using any logging command line options will override the settings.</so <translation><h1>登錄錯誤</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="206"/> - <location filename="../src/libsync/creds/oauth.cpp" line="209"/> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="204"/> + <location filename="../src/libsync/creds/oauth.cpp" line="208"/> <source>Error while refreshing the token: %1 : %2</source> <translation>刷新令牌時錯誤：％1：％2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="218"/> + <location filename="../src/libsync/creds/oauth.cpp" line="213"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2105,7 +2105,7 @@ Received data: %2</source> 收到的數據：％2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="239"/> + <location filename="../src/libsync/creds/oauth.cpp" line="234"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> <translation><h1>錯誤使用者</h1><p>您與使用者身份登錄<em>%1</em>，與必須使用者登錄<em>%2</em>。<br>請在另一個標籤中登出％3，然後<a href='%4'>點擊這裡</a>並以使用者％2身份登入</p></translation> </message> @@ -2361,17 +2361,17 @@ It is not advisable to use it.</source> <translation>嘗試連線到%1從%2</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="352"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> <translation>伺服器要求的認證請求被導向 '%1'，這個URL可能不安全，此伺服器可能設定有錯。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/> <source>There was an invalid response to an authenticated webdav request</source> <translation>從webdav的認證要求中有無效的回傳值</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="370"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> <translation>從伺服器存取被拒絕。為了正確驗證您的存取資訊 <a href="%1">請點選這裡</a> 透過瀏覽器來存取服務</translation> </message> @@ -2381,104 +2381,104 @@ It is not advisable to use it.</source> <translation>無效的超連結</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="419"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>本地同步資料夾%1已存在, 將其設置為同步<br/><br/></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="427"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="422"/> <source>Creating local sync folder %1...</source> <translation>建立本地同步資料夾 %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="433"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="428"/> <source>failed.</source> <translation>失敗</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="435"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/> <source>Could not create local folder %1</source> <translation>無法建立本地資料夾 %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/> <source>No remote folder specified!</source> <translation>沒有指定遠端資料夾!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/> <source>Error: %1</source> <translation>錯誤： %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="480"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/> <source>creating folder on ownCloud: %1</source> <translation>在 ownCloud 建立資料夾： %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="491"/> <source>Remote folder %1 created successfully.</source> <translation>遠端資料夾%1建立成功!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="493"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>遠端資料夾%1已存在,連線同步中</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="502"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>在HTTP建立資料夾失敗, error code %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="504"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>由於帳號或密碼錯誤，遠端資料夾建立失敗<br/>請檢查您的帳號密碼。</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="503"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">遠端資料夾建立失敗,也許是因為所提供的帳號密碼錯誤</font><br/>請重新檢查您的帳號密碼</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="509"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>建立遠端資料夾%1發生錯誤<tt>%2</tt>失敗</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>從%1到遠端資料夾%2的連線已建立</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/> <source>Successfully connected to %1!</source> <translation>成功連接到 %1 ！</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="538"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>無法建立連線%1, 請重新檢查</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="552"/> <source>Folder rename failed</source> <translation>重新命名資料夾失敗</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="553"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>無法移除與備份此資料夾，因為有其他的程式正在使用其中的資料夾或者檔案。請關閉使用中的資料夾或檔案並重試或者取消設定。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="610"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>本地同步資料夾 %1 建立成功!</b></font></translation> </message> @@ -3892,7 +3892,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="357"/> + <location filename="../src/libsync/theme.cpp" line="382"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation><p>版本％1。 欲了解更多信息，請訪問<a href="%2">https://%3</a></p><p>有關已知問題和幫助，請訪問：<a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>由Klaas Freitag，Daniel Molkentin，Olivier Goffart，MarkusGötz，Jan-Christoph Borchardt，ThomasMüller，Dominik Schmidt，Michael Stingl，Hannah von Reth等人撰寫。</small></p><p>版權所有ownCloud GmbH</p><p>由％4分發，並根據GNU通用公開的許可證（GPL）2.0版獲得許可。<br/>%5和％5徽標是％4在美國和/或其他國家或地區的註冊商標。</p><p><small>%6</small></p></translation> </message> @@ -4352,37 +4352,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="449"/> + <location filename="../src/common/utility.cpp" line="451"/> <source>in the future</source> <translation>在將來</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="445"/> + <location filename="../src/common/utility.cpp" line="447"/> <source>%n day(s) ago</source> <translation><numerusform>%n 幾天前(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="453"/> + <location filename="../src/common/utility.cpp" line="455"/> <source>%n hour(s) ago</source> <translation><numerusform>%n 幾小時前(s)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>now</source> <translation>現在</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="460"/> + <location filename="../src/common/utility.cpp" line="462"/> <source>Less than a minute ago</source> <translation>不到一分鐘前</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>%n minute(s) ago</source> <translation><numerusform>%n 幾分鐘前(s)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>Some time ago</source> <translation>前一段時間</translation> </message> @@ -4467,7 +4467,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="332"/> + <location filename="../src/libsync/theme.cpp" line="360"/> <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7</source> <translation>％1％2％3％4％8％9Libraries Qt％5，％6％8使用虛擬文件插件：％7</translation> </message> @@ -4475,7 +4475,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="322"/> + <location filename="../src/libsync/theme.cpp" line="350"/> <source>%1 (Built against Qt %1)</source> <translation>%1 (針對Qt構建%1)</translation> </message> @@ -4483,7 +4483,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="327"/> + <location filename="../src/libsync/theme.cpp" line="355"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4591,52 +4591,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="64"/> + <location filename="../src/libsync/theme.cpp" line="75"/> <source>Status undefined</source> <translation>未定義的狀態</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="67"/> + <location filename="../src/libsync/theme.cpp" line="78"/> <source>Waiting to start sync</source> <translation>等待開始同步</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="70"/> + <location filename="../src/libsync/theme.cpp" line="81"/> <source>Sync is running</source> <translation>同步中</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="73"/> + <location filename="../src/libsync/theme.cpp" line="84"/> <source>Sync Success</source> <translation>同步完成</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="76"/> + <location filename="../src/libsync/theme.cpp" line="87"/> <source>Sync Success, some files were ignored.</source> <translation>同步成功，部份檔案被忽略</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="79"/> + <location filename="../src/libsync/theme.cpp" line="90"/> <source>Sync Error</source> <translation>同步失敗</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="82"/> + <location filename="../src/libsync/theme.cpp" line="93"/> <source>Setup Error</source> <translation>安裝錯誤</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="85"/> + <location filename="../src/libsync/theme.cpp" line="96"/> <source>Preparing to sync</source> <translation>正在準備同步。</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="88"/> + <location filename="../src/libsync/theme.cpp" line="99"/> <source>Aborting...</source> <translation>中斷中…</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="91"/> + <location filename="../src/libsync/theme.cpp" line="102"/> <source>Sync is paused</source> <translation>同步已暫停</translation> </message> |